Merge branch 'release/2.2.2'

albertrdixon · Sep 21, 2016 · b6863a6 · b6863a6
2 parents 966169a + e877768
commit b6863a6
Show file tree

Hide file tree

Showing 1,281 changed files with 611,188 additions and 50,627 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,11 @@
 os: linux
 language: go
-go: 1.4.2
+go: 1.7.1
 
-install: 
-  - go get github.com/tools/godep
-  - go get github.com/mitchellh/gox
-before_script: make dep-restore
+install: make tools
+before_script: make restore
 script: make test-verbose
-after_success:
-  - "cd $GOROOT/src && GOOS=darwin GOARCH=amd64 ./make.bash --no-clean && cd -"
-  - make package
+after_success: make package
 
 deploy:
   provider: releases

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/dce.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/dce.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/doc.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/doc.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/hash.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/hash.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json_test.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/json_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/node.go b/Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/node.go