aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into fake_resolverGravatar Mark D. Roth2016-10-04
|\
* | Add fake resolver for tests.Gravatar Mark D. Roth2016-10-03
| * Merge pull request #8179 from stanley-cheung/php-proto3-prGravatar Stanley Cheung2016-10-03
| |\
| * | Merge pull request #8205 from ctiller/crashyGravatar Craig Tiller2016-10-03
|/| |
| | * PHP Proto3: run generate_projects.shGravatar Stanley Cheung2016-09-29
| |/ |/|
* | Merge branch 'master' of https://github.com/grpc/grpc into master-upmerge-fro...Gravatar Nicolas "Pixel" Noble2016-09-29
|\ \
* \ \ Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-underGravatar Nicolas "Pixel" Noble2016-09-29
|\ \ \
| | | * Cleanup test, check fail fast or notGravatar Craig Tiller2016-09-26
| |_|/ |/| |
| | * Merge remote-tracking branch 'upstream/master' into deadline_filterGravatar Mark D. Roth2016-09-23
| | |\ | |_|/ |/| |
* | | Merge pull request #7611 from markdroth/http_connectGravatar Mark D. Roth2016-09-23
|\ \ \
* \ \ \ Merge remote-tracking branch 'upstream/master' into cli_listGravatar Yuchen Zeng2016-09-21
|\ \ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into http_connectGravatar Mark D. Roth2016-09-21
| | |\ \ \ | | |/ / / | |/| | |
| | | | * Merge remote-tracking branch 'upstream/master' into deadline_filterGravatar Mark D. Roth2016-09-21
| | | | |\ | | |_|_|/ | |/| | |
| | | * | Backport of #8055 into v1.0.x.Gravatar Nicolas "Pixel" Noble2016-09-20
| * | | | Merge pull request #8052 from Vizerai/grpc_tracingGravatar Jim King2016-09-19
| |\ \ \ \
| | | | | * Merge remote-tracking branch 'upstream/master' into deadline_filterGravatar Mark D. Roth2016-09-19
| | | | | |\ | | |_|_|_|/ | |/| | | |
| | | * | | Merge remote-tracking branch 'upstream/master' into http_connectGravatar Mark D. Roth2016-09-16
| | | |\ \ \
| | | | | | * Merge remote-tracking branch 'upstream/master' into deadline_filterGravatar Mark D. Roth2016-09-16
| | | | | | |\ | | | | | |_|/ | | | | |/| |
| * | | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filterGravatar Mark D. Roth2016-09-16
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge pull request #8069 from grpc/revert-8068-revert-7279-grand-unified-clos...Gravatar Craig Tiller2016-09-16
| | |\ \ \ \ \
| | | | | * \ \ Merge remote-tracking branch 'upstream/master' into http_connectGravatar Mark D. Roth2016-09-16
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filterGravatar Mark D. Roth2016-09-16
| |\| | | | | |
| | * | | | | | Merge pull request #7996 from yang-g/canonicalGravatar Yang Gao2016-09-15
| | |\ \ \ \ \ \
| | | | | | | * | regenerate to fix santity testGravatar Jan Tattermusch2016-09-15
| | * | | | | | | Merge pull request #7559 from dgquintas/codegen_cleanseGravatar Craig Tiller2016-09-13
| | |\ \ \ \ \ \ \
| | | | | | | * \ \ Merge remote-tracking branch 'upstream/master' into http_connectGravatar Mark D. Roth2016-09-13
| | | | | | | |\ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | | | | | | | * Merge remote-tracking branch 'upstream/master' into deadline_filterGravatar Mark D. Roth2016-09-12
| | | | | | | | | |\ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | | | * | | | | Revert "Revert "Grand unified closures""Gravatar Craig Tiller2016-09-12
| | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Revert "Grand unified closures"Gravatar Craig Tiller2016-09-12
| | | | | | | | * Merge remote-tracking branch 'upstream/master' into deadline_filterGravatar Mark D. Roth2016-09-12
| | | | | | | | |\ | | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | Merge remote-tracking branch 'upstream/master' into cli_listGravatar Yuchen Zeng2016-09-12
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | | | | * | | | initial commit of tracing context filesGravatar Vizerai2016-09-09
| | | | * | | | | Add a helper to get canonical code from statusGravatar yang-g2016-09-09
| | | | | | | | * Merge remote-tracking branch 'upstream/master' into deadline_filterGravatar Mark D. Roth2016-09-09
| | | | | | | | |\ | | | | | | |_|_|/ | | | | | |/| | |
| * | | | | | | | Merge github.com:grpc/grpc into grand-unified-closuresGravatar Craig Tiller2016-09-08
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filterGravatar Mark D. Roth2016-09-08
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmergeGravatar Nicolas "Pixel" Noble2016-09-08
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| * | | | | | | | Fix merge errorGravatar Craig Tiller2016-09-07
| | | | | | | | * Merge remote-tracking branch 'upstream/master' into deadline_filterGravatar Mark D. Roth2016-09-07
| | | | | | | | |\ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into http_connectGravatar Mark D. Roth2016-09-07
| | | | | | | |\ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge github.com:grpc/grpc into grand-unified-closuresGravatar Craig Tiller2016-09-07
| |\| | | | | | |
| | * | | | | | | Merge pull request #7774 from ctiller/percent-encoderGravatar Craig Tiller2016-09-06
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge pull request #7953 from makdharma/grpc_caching_testGravatar Nicolas Noble2016-09-06
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | | | | | | * | Merge remote-tracking branch 'upstream/master' into http_connectGravatar Mark D. Roth2016-09-06
| | | | | | | | |\ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | | | | | * | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filterGravatar Mark D. Roth2016-09-06
| | | | | | |\ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge github.com:grpc/grpc into grand-unified-closuresGravatar Craig Tiller2016-09-02
| |\| | | | | | | |
| | | | | | | * | | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanseGravatar David Garcia Quintas2016-09-02
| | | | | | | |\ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | | | | | | | * Merge remote-tracking branch 'upstream/master' into deadline_filterGravatar Mark D. Roth2016-09-01
| | | | | | | | | |\ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge pull request #7943 from markdroth/client_channel_cleanupGravatar Mark D. Roth2016-09-01
| | |\ \ \ \ \ \ \ \
| | | | | | | | * \ \ Merge branch 'master' of github.com:grpc/grpc into codegen_cleanseGravatar David Garcia Quintas2016-09-01
| | | | | | | | |\ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |