Merge pull request #1671 from endocode/dongsu/vendor-update-20160825

vendor: update vendors as of 2016-08-25

Author: Dongsu Park

glide.lock

@@ -30,6 +30,7 @@ import:
   - http2
   - internal
   - trace
+  - lex/httplex
 - package: google.golang.org/api
   subpackages:
   - googleapi

glide.yaml

@@ -21,6 +21,37 @@ fi
 
 glide update --strip-vcs --strip-vendor --update-vendored --delete
 glide vc --only-code --no-tests --no-legal-files
-# NOTE: we cannot remove vendor/golang.org/x/net/internal to avoid build errors
-#       that internal packages cannot be imported.
-git checkout vendor/golang.org/x/net/internal
+
+# manual cleanup to reduce size of vendor trees
+
+# etcd
+ETCD_CLEANUP_DIRS="\
+ alarm auth clientv3 cmd compactor contrib discovery e2e embed etcdctl \
+ etcdmain etcdserver hack integration lease logos mvcc proxy raft rafthttp \
+ scripts snap store tools version wal \
+"
+pushd vendor/github.com/coreos/etcd
+	rm -rf $ETCD_CLEANUP_DIRS
+popd
+
+# godbus
+rm -rf vendor/github.com/godbus/dbus/_examples
+
+# go-systemd
+GOSYSTEMD_CLEANUP_DIRS="examples journal login1 machine1 sdjournal util"
+pushd vendor/github.com/coreos/go-systemd
+	rm -rf $GOSYSTEMD_CLEANUP_DIRS
+popd
+
+# grpc
+GRPC_CLEANUP_DIRS="benchmark examples test"
+pushd vendor/google.golang.org/grpc
+	rm -rf $GRPC_CLEANUP_DIRS
+popd
+
+# gogo/protobuf
+GOGOPROTOBUF_CLEANUP_DIRS="test vanity/test"
+pushd vendor/github.com/gogo/protobuf
+	rm -rf $GOGOPROTOBUF_CLEANUP_DIRS
+popd
+