*: update grpc-gateway, golang/protobuf vendor

etcd-io · Jul 7, 2016 · 8759230 · 8759230
1 parent c4a280e
commit 8759230
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 22 deletions.
diff --git a/cmd/Godeps/Godeps.json b/cmd/Godeps/Godeps.json
diff --git a/cmd/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go b/cmd/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go
diff --git a/cmd/vendor/github.com/golang/protobuf/proto/extensions.go b/cmd/vendor/github.com/golang/protobuf/proto/extensions.go
diff --git a/cmd/vendor/github.com/golang/protobuf/proto/text.go b/cmd/vendor/github.com/golang/protobuf/proto/text.go
diff --git a/scripts/genproto.sh b/scripts/genproto.sh
@@ -21,7 +21,7 @@ DIRS="./wal/walpb ./etcdserver/etcdserverpb ./snap/snappb ./raft/raftpb ./mvcc/m
 
 # exact version of protoc-gen-gogo to build
 GOGO_PROTO_SHA="2752d97bbd91927dd1c43296dbf8700e50e2708c"
-GRPC_GATEWAY_SHA="dcb844349dc5d2cb0300fdc4d2d374839d0d2e13"
+GRPC_GATEWAY_SHA="04d03d2c0176f9060cc3da4945a71abc759648bc"
 
 # set up self-contained GOPATH for building
 export GOPATH=${PWD}/gopath