Merge pull request #9 from universalcore/feature/adhoc-godep

Use Godep to manage dependencies
universalcore · Apr 8, 2016 · ef2fa51 · ef2fa51
2 parents e68d84d + 6b298ee
commit ef2fa51
Show file tree

Hide file tree

Showing 55 changed files with 6,093 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,8 @@
 language: go
 go:
-    - 1.4
+    - 1.6
     # - tip
 before_install:
-    - go get github.com/axw/gocov/gocov
     - go get github.com/mattn/goveralls
-    - go get golang.org/x/tools/cmd/cover
 script:
-    - $HOME/gopath/bin/goveralls -service=travis-ci
+    - 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/logdriver.go b/logdriver.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"github.com/ActiveState/tail"
+	"github.com/hpcloud/tail"
 	"github.com/gorilla/mux"
 )
 

diff --git a/logdriver_test.go b/logdriver_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ActiveState/tail"
+	"github.com/hpcloud/tail"
 )
 
 type LogDriverTest struct {

diff --git a/vendor/github.com/gorilla/context/.travis.yml b/vendor/github.com/gorilla/context/.travis.yml
diff --git a/vendor/github.com/gorilla/context/LICENSE b/vendor/github.com/gorilla/context/LICENSE
diff --git a/vendor/github.com/gorilla/context/README.md b/vendor/github.com/gorilla/context/README.md
diff --git a/vendor/github.com/gorilla/context/context.go b/vendor/github.com/gorilla/context/context.go
diff --git a/vendor/github.com/gorilla/context/doc.go b/vendor/github.com/gorilla/context/doc.go
diff --git a/vendor/github.com/gorilla/mux/.travis.yml b/vendor/github.com/gorilla/mux/.travis.yml