-
- Downloads
Merge github.com:google/grpc into qps
Conflicts: Makefile
Showing
- Makefile 90 additions, 30 deletionsMakefile
- examples/pubsub/publisher.h 1 addition, 1 deletionexamples/pubsub/publisher.h
- examples/pubsub/subscriber.h 1 addition, 1 deletionexamples/pubsub/subscriber.h
- src/compiler/cpp_generator.cc 143 additions, 10 deletionssrc/compiler/cpp_generator.cc
- src/compiler/cpp_generator.h 18 additions, 1 deletionsrc/compiler/cpp_generator.h
- src/compiler/cpp_plugin.cc 21 additions, 15 deletionssrc/compiler/cpp_plugin.cc
- src/core/iomgr/tcp_server.h 4 additions, 2 deletionssrc/core/iomgr/tcp_server.h
- src/core/iomgr/tcp_server_posix.c 51 additions, 9 deletionssrc/core/iomgr/tcp_server_posix.c
- src/core/iomgr/tcp_server_windows.c 20 additions, 16 deletionssrc/core/iomgr/tcp_server_windows.c
- src/core/security/server_secure_chttp2.c 11 additions, 8 deletionssrc/core/security/server_secure_chttp2.c
- src/core/surface/completion_queue.c 8 additions, 0 deletionssrc/core/surface/completion_queue.c
- src/core/surface/completion_queue.h 3 additions, 1 deletionsrc/core/surface/completion_queue.h
- src/core/surface/server.c 45 additions, 10 deletionssrc/core/surface/server.c
- src/core/surface/server.h 5 additions, 2 deletionssrc/core/surface/server.h
- src/core/surface/server_chttp2.c 4 additions, 3 deletionssrc/core/surface/server_chttp2.c
- src/php/bin/generate_proto_php.sh 40 additions, 0 deletionssrc/php/bin/generate_proto_php.sh
- src/php/ext/grpc/call.c 7 additions, 4 deletionssrc/php/ext/grpc/call.c
- src/php/ext/grpc/channel.c 1 addition, 0 deletionssrc/php/ext/grpc/channel.c
- src/python/interop/interop/_interop_test_case.py 5 additions, 5 deletionssrc/python/interop/interop/_interop_test_case.py
- src/python/interop/interop/client.py 19 additions, 5 deletionssrc/python/interop/interop/client.py
Loading
Please register or sign in to comment