Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-08-30 |
|\ | |||
| * | Merge pull request #7839 from markdroth/rename_client_config | Mark D. Roth | 2016-08-29 |
| |\ | | | | | | | Rename grpc_client_config to grpc_resolver_result. | ||
| * \ | Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x | Nicolas Noble | 2016-08-23 |
| |\ \ | | | | | | | | | Upmerge from v1.0.x | ||
| | | * | Rename grpc_client_config to grpc_resolver_result. | Mark D. Roth | 2016-08-22 |
| | | | | |||
| * | | | Merge pull request #7718 from adelez/build_stats | Nicolas Noble | 2016-08-19 |
| |\ \ \ | | |_|/ | |/| | | Tool for collecting build statistics. | ||
| | | * | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-20 |
| | |/| | |/| | | |||
| * | | | Merge pull request #7741 from nicolasnoble/manual-upmerge | Nicolas Noble | 2016-08-18 |
| |\ \ \ | | | | | | | | | | | Manual upmerge from v1.0.x to master. | ||
| * \ \ \ | Merge pull request #7735 from y-zeng/cli_main_fork | kpayson64 | 2016-08-17 |
| |\ \ \ \ | | | | | | | | | | | | | Improve gRPC CLI | ||
| * \ \ \ \ | Merge pull request #7594 from chedeti/grpc-thrift-v2 | kpayson64 | 2016-08-17 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | grpc thrift integration | ||
| | | | | | * | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | Nicolas "Pixel" Noble | 2016-08-17 |
| | | | | | | | |||
| * | | | | | | fix_interop_server_arg | Adele Zhou | 2016-08-16 |
| | | | | | | | |||
| * | | | | | | Merge pull request #7633 from thunderboltsid/add-pypy-to-testing-toolchain | kpayson64 | 2016-08-15 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | add PyPy to testing toolchain | ||
| | | | | * | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-16 |
| | |_|_|/| | | | |/| | | | | | | |||
| | | | | | | * | Merge pull request #7732 from kpayson64/python3_artifacts | kpayson64 | 2016-08-15 |
| | | | | | |/| | | | | | |/| | | | | | | | | | | Add Python3.5 artifact targets | ||
| | | | * | | | | Add CliCredentials, config_grpc_cli.h | Yuchen Zeng | 2016-08-15 |
| | | | | | | | | |||
| | | | | | | * | Add Python3.5 artifact targets | Ken Payson | 2016-08-15 |
| | | | | | | | | |||
| | | | * | | | | Merge remote-tracking branch 'upstream/master' into cli_main_fork | Yuchen Zeng | 2016-08-15 |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| | | | | | * | | Tool for collecting build statistics. | Adele Zhou | 2016-08-12 |
| | |_|_|_|/ / | |/| | | | | | |||
| | | | | * | | Merge pull request #7717 from nicolasnoble/update-build-packages | Nicolas Noble | 2016-08-12 |
| | | | | |\ \ | | | | | | | | | | | | | | | | | Updating build package C# scripts. | ||
| | | | | | * | | There's no 'platform' in package_targets.py, only labels. | Nicolas "Pixel" Noble | 2016-08-12 |
| | | | | | | | | |||
| | | | | | * | | Updating build package C# scripts. | Nicolas "Pixel" Noble | 2016-08-12 |
| | | | | | |/ | |||
| | | | | * / | Don't get dependencies for Node grpc-health-check package build | murgatroid99 | 2016-08-11 |
| | | | | |/ | |||
| * | | | | | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-11 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||
| * | | | | | Removed duplicated dependency for grpclb | David Garcia Quintas | 2016-08-09 |
| | | | | | | |||
| | * | | | | Merge pull request #7605 from sreecha/perf-fix-ga | Nicolas Noble | 2016-08-09 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Add clientSuccess and serverSuccess to BQ schema | ||
| * | | | | | | Extend the deadline of objc-examples-build to 30 minutes | Muxi Yan | 2016-08-09 |
| | | | | | | | |||
| | * | | | | | Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into ↵ | Jorge Canizales | 2016-08-05 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | p0-advance-protobuf-version | ||
| * | \ \ \ \ \ | Merge pull request #6915 from markdroth/filter_api | kpayson64 | 2016-08-05 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Implement C++ API for defining channel filters. | ||
| | | | | | * | | | add PyPy to testing toolchain | siddharthshukla | 2016-08-04 |
| | | | | | | | | | |||
| | | * | | | | | | Fix Jenkins test error | Muxi Yan | 2016-08-03 |
| | | | | | | | | | |||
| | | | | | | * | | sanity check for thrift | chedeti | 2016-08-03 |
| | | | | | | | | | |||
| * | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-08-04 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||
| | * | | | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 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 | Muxi Yan | 2016-08-02 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix Objective-C test pods for Cronet tests | ||
| | * \ \ \ \ \ \ \ | Merge pull request #7370 from rjshade/move_timeout_encoding | kpayson64 | 2016-08-02 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Move timeout_encoding to core/lib/transport | ||
| | | | | | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into filter_api | Mark D. Roth | 2016-08-02 |
| | | | | | |\ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||
| | * | | | | | | | | | Merge pull request #6774 from a-veitch/add_resource | kpayson64 | 2016-08-02 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add Census resource API and implementation. | ||
| | | | | | * \ \ \ \ \ | Merge pull request #7610 from kpayson64/downgrade_setuptools | kpayson64 | 2016-08-02 |
| | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Downgrade docker setuptools | ||
| | | | | | | * | | | | | | Downgrade docker setuptools | Ken Payson | 2016-08-02 |
| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-08-02 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | * | | | | | | | | Fix Jenkins test error | Muxi Yan | 2016-08-02 |
| | | | | | | | | | | | | | | |||
| | | | | | | | | * | | | | | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-08-02 |
| | | | | | | | | |\ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | |||
| | | * | | | | | | | | | | | Ran generate_projects.sh. | Mark D. Roth | 2016-08-02 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | Mark D. Roth | 2016-08-02 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-08-02 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * \ \ \ \ \ \ | Merge pull request #7580 from jtattermusch/netcore_nuget_to_rtm | Jan Tattermusch | 2016-08-02 |
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / | | | | | | | | |/| | | | | | | Update .NET core dependencies to RTM | ||
* | | | | | | | | | | | | | | | added gpr_types.h | David Garcia Quintas | 2016-08-01 |
| | | | | | | | | | | | | | | | |||
| | | | | | | | | | | | * | | | Add clientSuccess and serverSuccess to BQ schema | Sree Kuchibhotla | 2016-08-01 |
| | | | | | | | | |_|_|/ / / | | | | | | | | |/| | | | | | |||
| * | | | | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | |||
| | * | | | | | | | | | | | | Merge pull request #7602 from kpayson64/downgrade_setuptools.py | kpayson64 | 2016-08-01 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downgrade docker setuptools |