Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into lb_add_md | David Garcia Quintas | 2016-08-30 |
|\ | |||
| * | Updated protobuf to bba446bbf2ac7b0b9923d4eb07d5acd0665a8cf0 | David Garcia Quintas | 2016-08-30 |
* | | Merge branch 'master' of github.com:grpc/grpc into lb_add_md | David Garcia Quintas | 2016-08-29 |
|\| | |||
| * | Merge pull request #7839 from markdroth/rename_client_config | Mark D. Roth | 2016-08-29 |
| |\ | |||
* | | | Merge branch 'master' of github.com:grpc/grpc into lb_add_md | David Garcia Quintas | 2016-08-29 |
|\| | | |||
| * | | Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x | Nicolas Noble | 2016-08-23 |
| |\ \ | |||
| * \ \ | Merge pull request #7819 from stanley-cheung/php-update-composer | Stanley Cheung | 2016-08-23 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #7763 from thunderboltsid/add-pypy-to-dockerfile | kpayson64 | 2016-08-22 |
| |\ \ \ \ | |||
* | | | | | | Update protobuf version to 3.0.0 | David Garcia Quintas | 2016-08-22 |
| | | | | * | Rename grpc_client_config to grpc_resolver_result. | Mark D. Roth | 2016-08-22 |
| | | * | | | php: bump version | Stanley Cheung | 2016-08-22 |
| | |/ / / | |/| | | | |||
* / | | | | Updated LB proto and nanopb version | David Garcia Quintas | 2016-08-20 |
|/ / / / | |||
* | | | | Merge pull request #7718 from adelez/build_stats | Nicolas Noble | 2016-08-19 |
|\ \ \ \ | |_|_|/ |/| | | | |||
| | | * | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-20 |
| |_|/| |/| | | | |||
* | | | | Merge pull request #7308 from ctiller/moovee | Nicolas Noble | 2016-08-18 |
|\ \ \ \ | |||
| | | | * | Bumping version to 1.0.1-pre1. | Nicolas "Pixel" Noble | 2016-08-18 |
| | | | * | Merge pull request #7745 from nicolasnoble/no-more-pre | Nicolas Noble | 2016-08-18 |
| | | | |\ | |||
| | | | * \ | Merge pull request #7776 from kpayson64/templatize_dependencies | Nicolas Noble | 2016-08-18 |
| | | | |\ \ | |||
| | | | | * | | Use templates for python version dependencies | Ken Payson | 2016-08-18 |
| | | | * | | | Merge pull request #7752 from nicolasnoble/unsecure-should-be-unsecure | Nicolas Noble | 2016-08-18 |
| | | | |\ \ \ | | | | | |/ / | | | | |/| | | |||
* | | | | | | | Merge pull request #7741 from nicolasnoble/manual-upmerge | Nicolas Noble | 2016-08-18 |
|\ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ | Merge pull request #7735 from y-zeng/cli_main_fork | kpayson64 | 2016-08-17 |
|\ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ | Merge pull request #7594 from chedeti/grpc-thrift-v2 | kpayson64 | 2016-08-17 |
|\ \ \ \ \ \ \ \ \ | |||
| | | | | | | * | | | Add Python3.5 grpcio-tools binaries | Ken Payson | 2016-08-17 |
| | | | | | * | | | | Add PyPy 5.3.1 to dockerfile and template | siddharthshukla | 2016-08-17 |
| |_|_|_|_|/ / / / |/| | | | | | | | | |||
* | | | | | | | | | Merge pull request #7679 from stanley-cheung/fix-jenkins-linux-image | Stanley Cheung | 2016-08-17 |
|\ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * | | 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 #7448 from jcanizales/p0-archive-fix | makdharma | 2016-08-16 |
| | | | | | | |\ \ | |||
* | | | | | | | \ \ | Merge pull request #7633 from thunderboltsid/add-pypy-to-testing-toolchain | kpayson64 | 2016-08-15 |
|\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * | Removing pre2 flag. | Nicolas "Pixel" Noble | 2016-08-16 |
| | | | | | | | | |/ | | | | | | | | |/| | |||
| | | | | * | | | | | 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 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 |
| | | | | |\ \ \ \ | |||
| | | | | | * | | | | 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 github.com:grpc/grpc into moovee | Craig Tiller | 2016-08-09 |
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||
| * | | | | | | | Merge pull request #7623 from apolcyn/sys_inter_with_nuget | Nicolas Noble | 2016-08-09 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge pull request #7605 from sreecha/perf-fix-ga | Nicolas Noble | 2016-08-09 |
| |\ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | Extend the deadline of objc-examples-build to 30 minutes | Muxi Yan | 2016-08-09 |
| | | | | * | | | | | fix jenkins linux image in create script | Stanley Cheung | 2016-08-09 |
| |_|_|_|/ / / / / |/| | | | | | | | | |||
| | | | | | | | * | Solve merge conflict at gRPC-ProtoRPC.podspec | Jorge Canizales | 2016-08-08 |
| | | | | | | | |\ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
| | | | | | | | * | Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into p0-archive-fix | Jorge Canizales | 2016-08-07 |
| | | | | | | | |\ |