Merge e240704 into 9fd9d2b

uber · Dec 9, 2016 · f7213c0 · f7213c0
2 parents 9fd9d2b + e240704
commit f7213c0
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-Godeps/_workspace
+vendor/
 uberalls
 *.test
 

diff --git a/.travis.yml b/.travis.yml
@@ -2,15 +2,15 @@
 language: go
 
 go:
-  - 1.4
+  - 1.7
   - tip
 
 before_install:
   - go get -u github.com/axw/gocov/gocov
   - go get -u github.com/mattn/goveralls
   - go get golang.org/x/tools/cmd/cover
-  - go get github.com/tools/godep
-  - godep restore
+  - go get github.com/Masterminds/glide
+  - glide up
 
 script:
   - $HOME/gopath/bin/goveralls -service=travis-ci
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/Readme b/Godeps/Readme
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -0,0 +1,16 @@
+package: github.com/uber/uberalls
+import:
+- package: github.com/go-sql-driver/mysql
+  version: 9543750295406ef070f7de8ae9c43ccddd44e15e
+- package: github.com/jinzhu/gorm
+  version: 52ba1858c31dcbe1573f46f994d3cdf334729ff4
+- package: github.com/lib/pq
+  version: 2fe70547fcfbd6deedadd4af3702af16c0297723
+  subpackages:
+  - hstore
+- package: github.com/mattn/go-sqlite3
+  version: da2bf8a0f356364fb8189a5a276b5acf77839d30
+- package: github.com/onsi/ginkgo
+  version: e57363034d6f4d61cd9ef0b6917f69ad03977914
+- package: github.com/onsi/gomega
+  version: 982c859aeeffd81ab8717403fb03c379b6c92b5f