Merge pull request coreos#1644 from endocode/dongsu/update-glide-vend…

…or-20160719 vendor: update glide and vendors
endocode · Jul 21, 2016 · 0780574 · 0780574
2 parents 9b1c1bc + d81c1f5
commit 0780574
Show file tree

Hide file tree

Showing 33 changed files with 520 additions and 386 deletions.
diff --git a/fleetctl/fleetctl.go b/fleetctl/fleetctl.go
@@ -226,7 +226,7 @@ func main() {
 	log.EnableTimestamps()
 
 	if len(os.Args) == 1 {
-		cmdFleet.Help()
+		cmdFleet.HelpFunc()(cmdFleet, os.Args)
 		os.Exit(0)
 	}
 

diff --git a/glide.lock b/glide.lock
diff --git a/scripts/glide-update.sh b/scripts/glide-update.sh
@@ -4,8 +4,8 @@
 #
 set -e
 
-if ! [[ "$0" =~ "scripts/glide-update.sh" ]]; then
-	echo "must be run from repository root"
+if ! [[ "$PWD" = "$GOPATH/src/github.com/coreos/fleet" ]]; then
+	echo "must be run from \$GOPATH/src/github.com/coreos/fleet"
 	exit 255
 fi
 

diff --git a/vendor/github.com/coreos/etcd/client/client.go b/vendor/github.com/coreos/etcd/client/client.go
diff --git a/vendor/github.com/coreos/etcd/client/cluster_error.go b/vendor/github.com/coreos/etcd/client/cluster_error.go
diff --git a/vendor/github.com/coreos/etcd/client/keys.go b/vendor/github.com/coreos/etcd/client/keys.go
diff --git a/vendor/github.com/coreos/etcd/pkg/types/urls.go b/vendor/github.com/coreos/etcd/pkg/types/urls.go
diff --git a/vendor/github.com/coreos/go-semver/semver/semver.go b/vendor/github.com/coreos/go-semver/semver/semver.go