-
- Downloads
Merge branch 'shindig' of https://github.com/ctiller/grpc into shindig
Conflicts: src/core/iomgr/tcp_client_windows.c
Showing
- include/grpc++/security/auth_metadata_processor.h 1 addition, 1 deletioninclude/grpc++/security/auth_metadata_processor.h
- include/grpc++/security/credentials.h 1 addition, 1 deletioninclude/grpc++/security/credentials.h
- src/core/channel/channel_args.h 1 addition, 1 deletionsrc/core/channel/channel_args.h
- src/core/client_config/resolvers/zookeeper_resolver.c 34 additions, 32 deletionssrc/core/client_config/resolvers/zookeeper_resolver.c
- src/core/iomgr/exec_ctx.h 25 additions, 1 deletionsrc/core/iomgr/exec_ctx.h
- src/core/iomgr/tcp_client_windows.c 1 addition, 1 deletionsrc/core/iomgr/tcp_client_windows.c
- src/core/iomgr/tcp_server_windows.c 3 additions, 3 deletionssrc/core/iomgr/tcp_server_windows.c
- src/cpp/client/secure_credentials.cc 1 addition, 1 deletionsrc/cpp/client/secure_credentials.cc
- test/cpp/end2end/end2end_test.cc 4 additions, 4 deletionstest/cpp/end2end/end2end_test.cc
Loading
Please register or sign in to comment