Merge branch 'master' of github.com:grpc/grpc into travis-speedup
Conflicts: .travis.yml
No related branches found
No related tags found
Showing
- .gitmodules 1 addition, 1 deletion.gitmodules
- .travis.yml 12 additions, 1 deletion.travis.yml
- BUILD 832 additions, 0 deletionsBUILD
- CONTRIBUTING.md 1 addition, 0 deletionsCONTRIBUTING.md
- Makefile 6213 additions, 8068 deletionsMakefile
- README.md 4 additions, 4 deletionsREADME.md
- build.json 302 additions, 89 deletionsbuild.json
- doc/interop-test-descriptions.md 709 additions, 0 deletionsdoc/interop-test-descriptions.md
- examples/pubsub/README 1 addition, 0 deletionsexamples/pubsub/README
- examples/pubsub/main.cc 22 additions, 32 deletionsexamples/pubsub/main.cc
- examples/pubsub/publisher.cc 2 additions, 5 deletionsexamples/pubsub/publisher.cc
- examples/pubsub/publisher.h 1 addition, 1 deletionexamples/pubsub/publisher.h
- examples/pubsub/publisher_test.cc 15 additions, 18 deletionsexamples/pubsub/publisher_test.cc
- examples/pubsub/pubsub.proto 0 additions, 729 deletionsexamples/pubsub/pubsub.proto
- examples/pubsub/subscriber.cc 2 additions, 5 deletionsexamples/pubsub/subscriber.cc
- examples/pubsub/subscriber.h 1 addition, 1 deletionexamples/pubsub/subscriber.h
- examples/pubsub/subscriber_test.cc 8 additions, 13 deletionsexamples/pubsub/subscriber_test.cc
- gRPC.podspec 93 additions, 0 deletionsgRPC.podspec
- include/grpc++/channel_interface.h 5 additions, 1 deletioninclude/grpc++/channel_interface.h
- include/grpc++/client_context.h 19 additions, 9 deletionsinclude/grpc++/client_context.h
Loading
Please register or sign in to comment