Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into y12kdm3 | Craig Tiller | 2015-08-18 |
|\ | |||
| * | clang-format all source | Craig Tiller | 2015-08-18 |
| | | |||
| * | Merge pull request #2965 from yang-g/lame_client_error_message | Craig Tiller | 2015-08-18 |
| |\ | | | | | | | Let lame_client accept error status | ||
| * \ | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-17 |
| |\ \ | |||
| | | * | Let lame_client accept error status | yang-g | 2015-08-17 |
| | |/ | |||
* | | | Merge github.com:grpc/grpc into y12kdm3 | Craig Tiller | 2015-08-17 |
|\ \ \ | | |/ | |/| | |||
| * | | Merge pull request #2549 from hongweiwang/zookeeper | David G. Quintas | 2015-08-14 |
| |\ \ | | | | | | | | | Zookeeper name resolver | ||
| * \ \ | Merge pull request #2376 from rjshade/add_udp_server_2 | Yang Gao | 2015-08-13 |
| |\ \ \ | | | | | | | | | | | Add UDP server to gRPC. | ||
| | | * | | Minor fix on comments | Hongwei Wang | 2015-08-13 |
| | | | | | |||
| * | | | | Renamed "none" as "identity" for the no-op compression algorithm for ↵ | David Garcia Quintas | 2015-08-13 |
| | | | | | | | | | | | | | | | | | | | | consistency with the spec | ||
| | | * | | Address comments and update grpc plugins | Hongwei Wang | 2015-08-13 |
| | | | | | |||
| | * | | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | * | | | Update to latest API changes. | Robbie Shade | 2015-08-13 |
| | | | | | |||
| * | | | | Merge pull request #2921 from yang-g/unknown_service | Vijay Pai | 2015-08-13 |
| |\ \ \ \ | | | | | | | | | | | | | Use a sync service to handle requests to unknown services | ||
| | | | | * | proto3 required changes | David Garcia Quintas | 2015-08-13 |
| | | | | | | |||
| | | * | | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile | ||
| | | | | | * | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-13 |
| | | | | | |\ | | | | | |_|/ | | | | |/| | | |||
| | | | | | * | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-13 |
| | | | | | |\ | |||
| * | | | | | \ | Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown | Nicolas "Pixel" Noble | 2015-08-13 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | * | | | | | | Merge pull request #2922 from yang-g/proto3_cpp | Vijay Pai | 2015-08-13 |
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | use proto3 syntax in c++ test protos | ||
| | * | | | | | | Removing gpr_cancelable. | Nicolas "Pixel" Noble | 2015-08-13 |
| | | | | | | | | |||
| | | * | | | | | update the interop test protos and code to proto3 | yang-g | 2015-08-13 |
| | | | | | | | | |||
| | | | | | | * | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-13 |
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | | | |||
| | | | | * | | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 |
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | | | |||
| | | * | | | | | use proto3 syntax in c++ test protos | yang-g | 2015-08-13 |
| | | | | | | | | |||
| | | | | | | * | Make sure COMPRESSABLE is the default for LargeUnary | David Garcia Quintas | 2015-08-13 |
| | | | | | | | | |||
| | | | * | | | | Use a sync service to handle requests to unknown services | yang-g | 2015-08-13 |
| | | | | | | | | |||
| * | | | | | | | Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown | Nicolas "Pixel" Noble | 2015-08-13 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/cpp/client/channel.cc src/cpp/client/client_context.cc | ||
| | | | | | | * | Removed spurious line that forced COMPRESSABLE for large unaries | David Garcia Quintas | 2015-08-13 |
| | | | | | | | | |||
| | | | | | * | | Fix zookeeper resolver plugin bugs | Hongwei Wang | 2015-08-12 |
| | | | | | | | | |||
| | * | | | | | | Merge pull request #2847 from jboeuf/client_auth_filter_error_handling | Jorge Canizales | 2015-08-12 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | C client library auth: produce adequate error codes and messages. | ||
| * | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown | Nicolas "Pixel" Noble | 2015-08-13 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ruby/ext/grpc/rb_channel.c | ||
| | * | | | | | | | Merge pull request #2771 from vjpai/asklipion2 | David G. Quintas | 2015-08-12 |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | Remove C++11 dependencies in QPS test that break old compilers | ||
* | | | | | | | | | Merge github.com:grpc/grpc into y12kdm3 | Craig Tiller | 2015-08-12 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/security/google_default_credentials.c test/core/security/verify_jwt.c | ||
| | | | | | | * | | Debugging | Hongwei Wang | 2015-08-12 |
| | | | | | | | | | |||
| | | | | | | * | | Minor fix for debugging | Hongwei Wang | 2015-08-12 |
| | | | | | | | | | |||
| | * | | | | | | | Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown | Nicolas "Pixel" Noble | 2015-08-12 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/node/ext/call.cc src/node/ext/channel.cc | ||
| * | | | | | | | | Merge pull request #2893 from jboeuf/fix_clock_in_jwt_verifier | Yang Gao | 2015-08-12 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixing clock type for JWT verifier tool. | ||
| | | | * | | | | | | clang-format | Vijay Pai | 2015-08-11 |
| | | | | | | | | | | |||
| | | | * | | | | | | Address concerns from review | vjpai | 2015-08-11 |
| | | | | | | | | | | |||
| * | | | | | | | | | Removed "<:" bigram confusing gcc 4.4 | David G. Quintas | 2015-08-11 |
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resulted in error: ```test/cpp/end2end/end2end_test.cc:120: error: ‘<::’ cannot begin a template-argument list test/cpp/end2end/end2end_test.cc:120: note: ‘<:’ is an alternate spelling for ‘[’. Insert whitespace between ‘<’ and ‘::’ test/cpp/end2end/end2end_test.cc:120: note: (if you use ‘-fpermissive’ G++ will accept your code) make: *** [objs/opt/test/cpp/end2end/end2end_test.o] Error 1``` | ||
| | * | | | | | | | Fixing clock type. | Julien Boeuf | 2015-08-11 |
| |/ / / / / / / | |||
| | * | | | | | | Merge remote-tracking branch 'google/master' into the-ultimate-showdown | Nicolas "Pixel" Noble | 2015-08-12 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/csharp/ext/grpc_csharp_ext.c | ||
| | | | * | | | | Fixing test. | Julien Boeuf | 2015-08-11 |
| | | | | | | | | |||
| | | | | | | * | Merged PerformLargeCompressedUnary into PerformLargeUnary | David Garcia Quintas | 2015-08-11 |
| | | | | | | | | |||
| * | | | | | | | Merge pull request #2780 from soltanmm/compiler-tests | Nathaniel Manista | 2015-08-11 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Move Python protoc plugin tests to grpcio_test. | ||
| | | | | | | * | | Formatting zookeeper_test | Hongwei Wang | 2015-08-10 |
| | | | | | | | | | |||
| | | | | | | * | | Update zookeeper test to have two servers | Hongwei Wang | 2015-08-10 |
| | | | | | | | | | |||
| | | | | | | | * | Reverted unnecessary changes to server | David Garcia Quintas | 2015-08-10 |
| | | | | | | | | | |||
| | | | | | | | * | Added new tests for compression | David Garcia Quintas | 2015-08-09 |
| | | | | | | | | |