Merge branch 'master' of github.com:google/grpc into add_timed_out_tests_back
Showing
- Makefile 166 additions, 18 deletionsMakefile
- build.json 82 additions, 57 deletionsbuild.json
- examples/pubsub/main.cc 1 addition, 2 deletionsexamples/pubsub/main.cc
- examples/pubsub/publisher_test.cc 3 additions, 3 deletionsexamples/pubsub/publisher_test.cc
- examples/pubsub/subscriber_test.cc 3 additions, 3 deletionsexamples/pubsub/subscriber_test.cc
- include/grpc++/async_unary_call.h 1 addition, 1 deletioninclude/grpc++/async_unary_call.h
- include/grpc++/channel_arguments.h 3 additions, 3 deletionsinclude/grpc++/channel_arguments.h
- include/grpc++/create_channel.h 0 additions, 5 deletionsinclude/grpc++/create_channel.h
- include/grpc++/credentials.h 51 additions, 64 deletionsinclude/grpc++/credentials.h
- include/grpc++/server.h 5 additions, 8 deletionsinclude/grpc++/server.h
- include/grpc++/server_builder.h 10 additions, 6 deletionsinclude/grpc++/server_builder.h
- include/grpc++/server_credentials.h 12 additions, 17 deletionsinclude/grpc++/server_credentials.h
- include/grpc/grpc.h 3 additions, 0 deletionsinclude/grpc/grpc.h
- include/grpc/grpc_security.h 2 additions, 7 deletionsinclude/grpc/grpc_security.h
- src/core/iomgr/pollset_posix.c 1 addition, 1 deletionsrc/core/iomgr/pollset_posix.c
- src/core/iomgr/resolve_address_posix.c 1 addition, 1 deletionsrc/core/iomgr/resolve_address_posix.c
- src/core/security/credentials.c 6 additions, 6 deletionssrc/core/security/credentials.c
- src/core/security/factories.c 1 addition, 29 deletionssrc/core/security/factories.c
- src/core/security/google_default_credentials.c 2 additions, 2 deletionssrc/core/security/google_default_credentials.c
- src/core/security/json_token.c 1 addition, 1 deletionsrc/core/security/json_token.c
Loading
Please register or sign in to comment