Merge branch 'next'

gnydick · May 8, 2014 · c59776d · c59776d
2 parents a2bd573 + 105e80e
commit c59776d
Show file tree

Hide file tree

Showing 196 changed files with 43,427 additions and 2,025 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,32 @@ config.log
 config.status
 configure
 pom.xml
+*.pyc
+.*.swp
+*.rrd
+*.class
+*/target/*
+*.orig
+*.log
+
+#for Intellij
+\.idea
+*.iml
+
+#for guava rpm maker
+guava-rpm-maker/\.project
+
+# for mac finder
+.DS_Store
+
+# for eclipse
+.pydevproject
+.metadata
+.project
+.classpath
+.settings
+
+# maven
+src-main
+src-test
+plugin_test.jar
diff --git a/AUTHORS b/AUTHORS
@@ -14,10 +14,14 @@ Arista Networks, Inc.
 Betfair Group plc
 Box, Inc.
 Bump Technologies, Inc.
+Limelight Networks, Inc.
 StumbleUpon, Inc.
 
 
 Benoit Sigoure <tsunanet@gmail.com>
+Chris Larsen <clarsen575@gmail.com>
+David Bainbridge <dbainbridge@zenoss.com>
 Geoffrey Anderson <geoff@geoffreyanderson.net>
 Ion Savin <comp_@gmx.net>
+Nicholas Whitehead <whitehead.nicholas@gmail.com>
 Will Moss <wmoss@bu.mp>