Resolved merge conflicts with upstream/release-0_12
No related branches found
No related tags found
Showing
- BUILD 3 additions, 0 deletionsBUILD
- Makefile 2 additions, 0 deletionsMakefile
- binding.gyp 1 addition, 0 deletionsbinding.gyp
- build.yaml 1 addition, 0 deletionsbuild.yaml
- gRPC.podspec 1 addition, 0 deletionsgRPC.podspec
- grpc.gemspec 3 additions, 2 deletionsgrpc.gemspec
- include/grpc/grpc.h 11 additions, 1 deletioninclude/grpc/grpc.h
- package.json 3 additions, 2 deletionspackage.json
- src/core/surface/call.c 9 additions, 4 deletionssrc/core/surface/call.c
- src/core/surface/validate_metadata.c 73 additions, 0 deletionssrc/core/surface/validate_metadata.c
- src/core/transport/chttp2/bin_encoder.c 1 addition, 6 deletionssrc/core/transport/chttp2/bin_encoder.c
- src/core/transport/chttp2/bin_encoder.h 1 addition, 3 deletionssrc/core/transport/chttp2/bin_encoder.h
- src/core/transport/chttp2/hpack_encoder.c 6 additions, 1 deletionsrc/core/transport/chttp2/hpack_encoder.c
- src/core/transport/chttp2/hpack_parser.c 6 additions, 1 deletionsrc/core/transport/chttp2/hpack_parser.c
- src/core/transport/metadata.c 0 additions, 34 deletionssrc/core/transport/metadata.c
- src/core/transport/metadata.h 2 additions, 0 deletionssrc/core/transport/metadata.h
- src/node/ext/call.cc 2 additions, 6 deletionssrc/node/ext/call.cc
- src/node/ext/node_grpc.cc 49 additions, 1 deletionsrc/node/ext/node_grpc.cc
- src/node/interop/async_delay_queue.js 2 additions, 2 deletionssrc/node/interop/async_delay_queue.js
- src/node/src/metadata.js 11 additions, 9 deletionssrc/node/src/metadata.js
Loading
Please register or sign in to comment