upgrade protobuf and grpc

fix #435 Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-29 09:43:02 +08:00
parent d4ee7aacc5
commit 9a03957090
106 changed files with 7914 additions and 3967 deletions
--- a/vendor/github.com/golang/protobuf/proto/text_parser.go
+++ b/vendor/github.com/golang/protobuf/proto/text_parser.go
@@ -865,7 +865,7 @@ func (p *textParser) readAny(v reflect.Value, props *Properties) error {
 		return p.readStruct(fv, terminator)
 	case reflect.Uint32:
 		if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
-			fv.SetUint(uint64(x))
+			fv.SetUint(x)
 			return nil
 		}
 	case reflect.Uint64: