Merge branch 'master' into exp-retry

vitessio · Jan 31, 2015 · 0dd9321 · 0dd9321
2 parents 5984be8 + 50464e7
commit 0dd9321
Show file tree

Hide file tree

Showing 597 changed files with 31,844 additions and 13,828 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,10 @@
 *.swp
 tags
 
+# Eclipse files
+.project
+.settings/
+
 # cbson & other C build dirs
 **/build
 
@@ -21,3 +25,7 @@ third_party/mysql
 java/vtocc-client/target
 java/vtocc-jdbc-driver/target
 third_party/acolyte
+
+# intellij files
+*.iml
+.idea
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,21 @@
+language: go
+go:
+  - 1.4
+env:
+  global:
+    - MYSQL_FLAVOR=MariaDB
+  matrix:
+    - MAKE_TARGET=java_vtgate_client_test
+    - MAKE_TARGET=unit_test_goveralls
+    - MAKE_TARGET=small_integration_test
+    - MAKE_TARGET=medium_integration_test
+    - MAKE_TARGET=large_integration_test
+    - MAKE_TARGET=queryservice_test
+    - MAKE_TARGET=unit_test
+before_install:
+  - bash -v travis/dependencies.sh
+install:
+  - bash -v bootstrap.sh
+script:
+  - source dev.env
+  - travis_retry make $MAKE_TARGET
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/Readme b/Godeps/Readme
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child.go
diff --git a/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child_test.go b/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd/add_child_test.go