Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into lb_add_md | 2016-09-02 | |
|\ | |||
| * | Merge pull request #7943 from markdroth/client_channel_cleanup | 2016-09-01 | |
| |\ | | | | | | | Move subchannel_call_holder code into client_channel module. | ||
| * \ | Merge pull request #7936 from y-zeng/log_test | 2016-09-01 | |
| |\ \ | | | | | | | | | Add no-logging test | ||
| * \ \ | Merge pull request #7942 from a-veitch/add_proto | 2016-09-01 | |
| |\ \ \ | | | | | | | | | | | Add Trace context proto. This is used to transmit trace context between RPC client and server systems. | ||
| * \ \ \ | Merge pull request #7877 from adelez/route_to_gfe | 2016-09-01 | |
| |\ \ \ \ | | | | | | | | | | | | | Use the VIP that routes to GFE. | ||
| | | | * \ | Merge remote-tracking branch 'upstream/master' into log_test | 2016-08-31 | |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | | | * | Move subchannel_call_holder code into client_channel module. | 2016-08-31 | |
| | |_|_|/ | |/| | | | |||
| | | * | | add trace context proto | 2016-08-31 | |
| | |/ / | |/| | | |||
| | | * | Add no-logging test | 2016-08-30 | |
| | | | | |||
* | | | | Merge branch 'master' of github.com:grpc/grpc into lb_add_md | 2016-08-30 | |
|\| | | | |||
| * | | | Updated protobuf to bba446bbf2ac7b0b9923d4eb07d5acd0665a8cf0 | 2016-08-30 | |
| | |/ | |/| | |||
* | | | Merge branch 'master' of github.com:grpc/grpc into lb_add_md | 2016-08-29 | |
|\| | | |||
| * | | Merge pull request #7839 from markdroth/rename_client_config | 2016-08-29 | |
| |\ \ | | | | | | | | | Rename grpc_client_config to grpc_resolver_result. | ||
* | | | | Merge branch 'master' of github.com:grpc/grpc into lb_add_md | 2016-08-29 | |
|\| | | | |||
| | | * | Use the VIP that routes to GFE. | 2016-08-25 | |
| | |/ | |/| | |||
| * | | Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x | 2016-08-23 | |
| |\ \ | | | | | | | | | Upmerge from v1.0.x | ||
| | | * | Rename grpc_client_config to grpc_resolver_result. | 2016-08-22 | |
| | | | | |||
* | | | | Updated LB proto and nanopb version | 2016-08-20 | |
|/ / / | |||
* | | | Merge pull request #7718 from adelez/build_stats | 2016-08-19 | |
|\ \ \ | |_|/ |/| | | Tool for collecting build statistics. | ||
| | * | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | 2016-08-20 | |
| |/| |/| | | |||
* | | | Merge pull request #7741 from nicolasnoble/manual-upmerge | 2016-08-18 | |
|\ \ \ | | | | | | | | | Manual upmerge from v1.0.x to master. | ||
* \ \ \ | Merge pull request #7735 from y-zeng/cli_main_fork | 2016-08-17 | |
|\ \ \ \ | | | | | | | | | | | Improve gRPC CLI | ||
* \ \ \ \ | Merge pull request #7594 from chedeti/grpc-thrift-v2 | 2016-08-17 | |
|\ \ \ \ \ | | | | | | | | | | | | | grpc thrift integration | ||
| | | | | * | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | 2016-08-17 | |
| | | | | | | |||
* | | | | | | fix_interop_server_arg | 2016-08-16 | |
| | | | | | | |||
* | | | | | | Merge pull request #7633 from thunderboltsid/add-pypy-to-testing-toolchain | 2016-08-15 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | add PyPy to testing toolchain | ||
| | | | * | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | 2016-08-16 | |
| |_|_|/| | | |/| | | | | | | |||
| | | | | | * | Merge pull request #7732 from kpayson64/python3_artifacts | 2016-08-15 | |
| | | | | |/| | | | | |/| | | | | | | | | | Add Python3.5 artifact targets | ||
| | | * | | | | Add CliCredentials, config_grpc_cli.h | 2016-08-15 | |
| | | | | | | | |||
| | | | | | * | Add Python3.5 artifact targets | 2016-08-15 | |
| | | | | | | | |||
| | | * | | | | Merge remote-tracking branch 'upstream/master' into cli_main_fork | 2016-08-15 | |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | |||
| | | | | * | | Tool for collecting build statistics. | 2016-08-12 | |
| |_|_|_|/ / |/| | | | | | |||
| | | | * | | Merge pull request #7717 from nicolasnoble/update-build-packages | 2016-08-12 | |
| | | | |\ \ | | | | | | | | | | | | | | | Updating build package C# scripts. | ||
| | | | | * | | There's no 'platform' in package_targets.py, only labels. | 2016-08-12 | |
| | | | | | | | |||
| | | | | * | | Updating build package C# scripts. | 2016-08-12 | |
| | | | | |/ | |||
| | | | * / | Don't get dependencies for Node grpc-health-check package build | 2016-08-11 | |
| | | | |/ | |||
* | | | | | Merge branch 'v1.0.x' into manual-upmerge | 2016-08-11 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||
* | | | | | Removed duplicated dependency for grpclb | 2016-08-09 | |
| | | | | | |||
| * | | | | Merge pull request #7605 from sreecha/perf-fix-ga | 2016-08-09 | |
| |\ \ \ \ | | | | | | | | | | | | | Add clientSuccess and serverSuccess to BQ schema | ||
* | | | | | | Extend the deadline of objc-examples-build to 30 minutes | 2016-08-09 | |
| | | | | | | |||
| * | | | | | Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into ↵ | 2016-08-05 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | p0-advance-protobuf-version | ||
* | \ \ \ \ \ | Merge pull request #6915 from markdroth/filter_api | 2016-08-05 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Implement C++ API for defining channel filters. | ||
| | | | | * | | | add PyPy to testing toolchain | 2016-08-04 | |
| | | | | | | | | |||
| | * | | | | | | Fix Jenkins test error | 2016-08-03 | |
| | | | | | | | | |||
| | | | | | * | | sanity check for thrift | 2016-08-03 | |
| | | | | | | | | |||
* | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-08-04 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| * | | | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | 2016-08-03 | |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt Makefile build.yaml package.json src/core/lib/surface/version.c src/csharp/Grpc.Auth/project.json src/csharp/Grpc.Core/VersionInfo.cs src/csharp/Grpc.Core/project.json src/csharp/Grpc.HealthCheck/project.json src/csharp/build_packages.bat src/node/health_check/package.json src/node/tools/package.json src/python/grpcio/grpc_version.py src/python/grpcio_health_checking/grpc_version.py src/python/grpcio_tests/grpc_version.py src/ruby/lib/grpc/version.rb src/ruby/tools/version.rb tools/distrib/python/grpcio_tools/grpc_version.py tools/doxygen/Doxyfile.c++ tools/doxygen/Doxyfile.c++.internal tools/doxygen/Doxyfile.core tools/doxygen/Doxyfile.core.internal | ||
| * | | | | | | | Merge pull request #7554 from muxi/fix-cronet-interop-test | 2016-08-02 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix Objective-C test pods for Cronet tests | ||
| * \ \ \ \ \ \ \ | Merge pull request #7370 from rjshade/move_timeout_encoding | 2016-08-02 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Move timeout_encoding to core/lib/transport | ||
| | | | | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into filter_api | 2016-08-02 | |
| | | | | |\ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | |