aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:grpc/grpc into codegen_cleanseGravatar David Garcia Quintas2016-08-31
|\
* \ Merge branch 'master' of github.com:grpc/grpc into codegen_cleanseGravatar David Garcia Quintas2016-08-30
|\ \
| | * Updated protobuf to bba446bbf2ac7b0b9923d4eb07d5acd0665a8cf0Gravatar David Garcia Quintas2016-08-30
| |/
| * Merge pull request #7839 from markdroth/rename_client_configGravatar Mark D. Roth2016-08-29
| |\
| * \ Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.xGravatar Nicolas Noble2016-08-23
| |\ \
| * \ \ Merge pull request #7819 from stanley-cheung/php-update-composerGravatar Stanley Cheung2016-08-23
| |\ \ \
| * \ \ \ Merge pull request #7763 from thunderboltsid/add-pypy-to-dockerfileGravatar kpayson642016-08-22
| |\ \ \ \
| | | | | * Rename grpc_client_config to grpc_resolver_result.Gravatar Mark D. Roth2016-08-22
| | | * | | php: bump versionGravatar Stanley Cheung2016-08-22
| | |/ / / | |/| | |
| * | | | Merge pull request #7718 from adelez/build_statsGravatar Nicolas Noble2016-08-19
| |\ \ \ \ | | |_|_|/ | |/| | |
| | | | * Merge branch 'v1.0.x' of https://github.com/grpc/grpcGravatar Nicolas "Pixel" Noble2016-08-20
| | |_|/| | |/| | |
| * | | | Merge pull request #7308 from ctiller/mooveeGravatar Nicolas Noble2016-08-18
| |\ \ \ \
| | | | | * Bumping version to 1.0.1-pre1.Gravatar Nicolas "Pixel" Noble2016-08-18
| | | | | * Merge pull request #7745 from nicolasnoble/no-more-preGravatar Nicolas Noble2016-08-18
| | | | | |\
| | | | | * \ Merge pull request #7776 from kpayson64/templatize_dependenciesGravatar Nicolas Noble2016-08-18
| | | | | |\ \
| | | | | | * | Use templates for python version dependenciesGravatar Ken Payson2016-08-18
| | | | | * | | Merge pull request #7752 from nicolasnoble/unsecure-should-be-unsecureGravatar Nicolas Noble2016-08-18
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| |
| * | | | | | | Merge pull request #7741 from nicolasnoble/manual-upmergeGravatar Nicolas Noble2016-08-18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #7735 from y-zeng/cli_main_forkGravatar kpayson642016-08-17
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #7594 from chedeti/grpc-thrift-v2Gravatar kpayson642016-08-17
| |\ \ \ \ \ \ \ \ \
| | | | | | | | * | | Add Python3.5 grpcio-tools binariesGravatar Ken Payson2016-08-17
| | | | | | | * | | | Add PyPy 5.3.1 to dockerfile and templateGravatar siddharthshukla2016-08-17
| | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #7679 from stanley-cheung/fix-jenkins-linux-imageGravatar Stanley Cheung2016-08-17
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | * | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure.Gravatar Nicolas "Pixel" Noble2016-08-17
| | | | | | | | |/ /
| * | | | | | | | | fix_interop_server_argGravatar Adele Zhou2016-08-16
| | | | | | | | * | Merge pull request #7448 from jcanizales/p0-archive-fixGravatar makdharma2016-08-16
| | | | | | | | |\ \
| * | | | | | | | \ \ Merge pull request #7633 from thunderboltsid/add-pypy-to-testing-toolchainGravatar kpayson642016-08-15
| |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * Removing pre2 flag.Gravatar Nicolas "Pixel" Noble2016-08-16
| | | | | | | | | | |/ | | | | | | | | | |/|
| | | | | | * | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmergeGravatar Nicolas "Pixel" Noble2016-08-16
| | |_|_|_|/| | | | | | |/| | | | | | | | |
| | | | | | | | | * | Merge pull request #7732 from kpayson64/python3_artifactsGravatar kpayson642016-08-15
| | | | | | | |_|/| | | | | | | | |/| | | |
| | | | | * | | | | | Add CliCredentials, config_grpc_cli.hGravatar Yuchen Zeng2016-08-15
| | | | | | | | | * | Add Python3.5 artifact targetsGravatar Ken Payson2016-08-15
| | | | | * | | | | | Merge remote-tracking branch 'upstream/master' into cli_main_forkGravatar Yuchen Zeng2016-08-15
| | | | | |\ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | | | | | | | * | | Tool for collecting build statistics.Gravatar Adele Zhou2016-08-12
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | | | | | * | | | Merge pull request #7717 from nicolasnoble/update-build-packagesGravatar Nicolas Noble2016-08-12
| | | | | | |\ \ \ \
| | | | | | | * | | | There's no 'platform' in package_targets.py, only labels.Gravatar Nicolas "Pixel" Noble2016-08-12
| | | | | | | * | | | Updating build package C# scripts.Gravatar Nicolas "Pixel" Noble2016-08-12
| | | | | | | | |/ / | | | | | | | |/| |
| | | | | | * / | | Don't get dependencies for Node grpc-health-check package buildGravatar murgatroid992016-08-11
| | | | | | |/ / /
| * | | | | | | | Merge branch 'v1.0.x' into manual-upmergeGravatar Nicolas "Pixel" Noble2016-08-11
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Removed duplicated dependency for grpclbGravatar David Garcia Quintas2016-08-09
| | | | | | | * | Merge github.com:grpc/grpc into mooveeGravatar Craig Tiller2016-08-09
| | | | | | | |\ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Merge pull request #7623 from apolcyn/sys_inter_with_nugetGravatar Nicolas Noble2016-08-09
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge pull request #7605 from sreecha/perf-fix-gaGravatar Nicolas Noble2016-08-09
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | Extend the deadline of objc-examples-build to 30 minutesGravatar Muxi Yan2016-08-09
| | | | | | * | | | | fix jenkins linux image in create scriptGravatar Stanley Cheung2016-08-09
| | |_|_|_|/ / / / / | |/| | | | | | | |
| | | | | | | | | * Solve merge conflict at gRPC-ProtoRPC.podspecGravatar Jorge Canizales2016-08-08
| | | | | | | | | |\ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | | | | | | | * Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into p0-archive-fixGravatar Jorge Canizales2016-08-07
| | | | | | | | | |\
| | * | | | | | | | | Reducing diff.Gravatar Nicolas "Pixel" Noble2016-08-05
| | * | | | | | | | | That won't work properly. Falling back on fixing the list of dependencies.Gravatar Nicolas "Pixel" Noble2016-08-05
| | * | | | | | | | | Using the interop dependencies instead.Gravatar Nicolas "Pixel" Noble2016-08-05