Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #10586 from yang-g/error_details2 | Yang Gao | 2017-04-12 |
|\ | |||
* \ | Merge pull request #10473 from ctiller/truebin | Craig Tiller | 2017-04-12 |
|\ \ | |||
| * \ | Merge github.com:grpc/grpc into truebin | Craig Tiller | 2017-04-12 |
| |\ \ | |||
* | \ \ | Merge remote-tracking branch 'upstream/v1.2.x' into HEAD | Jan Tattermusch | 2017-04-12 |
|\ \ \ \ | |_|/ / |/| | | | |||
| | | * | Add helper function to supply and parse error_details from Status. | yang-g | 2017-04-11 |
| |_|/ |/| | | |||
* | | | Merge pull request #10501 from ctiller/epex2 | Craig Tiller | 2017-04-11 |
|\ \ \ | |||
| | * | | Bump version to 1.2.3 | murgatroid99 | 2017-04-07 |
| * | | | Update BUILD | Craig Tiller | 2017-04-06 |
* | | | | Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_v12x | Jan Tattermusch | 2017-04-06 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||
| | * | Update BUILD | Craig Tiller | 2017-04-05 |
| |/ |/| | |||
* | | Merge pull request #10423 from ctiller/minimal | Craig Tiller | 2017-04-04 |
|\ \ | |||
* \ \ | Merge pull request #8063 from royalharsh/buffers | kpayson64 | 2017-04-04 |
|\ \ \ | |||
| | * | | Update BUILD | Craig Tiller | 2017-04-03 |
| | | * | bump version to 1.2.2 | Jan Tattermusch | 2017-04-03 |
| | * | | optionalize max_age | Craig Tiller | 2017-03-31 |
| | * | | Reorganize ext tree | Craig Tiller | 2017-03-31 |
| |/ / |/| | | |||
* | | | Merge pull request #10382 from ctiller/checks | Craig Tiller | 2017-03-31 |
|\ \ \ | |||
* \ \ \ | Merge pull request #10318 from y-zeng/server_channel_max_age | Yuchen Zeng | 2017-03-31 |
|\ \ \ \ | |||
| | * | | | Fix BUILD | Craig Tiller | 2017-03-30 |
| | * | | | Fix build files | Craig Tiller | 2017-03-30 |
| | * | | | Reinstate one check, fix fall out | Craig Tiller | 2017-03-30 |
| |/ / / |/| | | | |||
| | | * | Update BUILD file | Ken Payson | 2017-03-28 |
* | | | | Move src/core/lib/tsi --> src/core/tsi | Craig Tiller | 2017-03-28 |
| | * | | Fix Bazel build | Harsh Vardhan | 2017-03-28 |
| |/ / |/| | | |||
| * | | Add max_age_filter | Yuchen Zeng | 2017-03-28 |
* | | | Merge pull request #10222 from makdharma/caching_with_uri | makdharma | 2017-03-26 |
|\ \ \ | |||
| * | | | fix for bazel build break | Makarand Dharmapurikar | 2017-03-24 |
| | | * | update to 1.2.1-pre2 in BUILD file too | Alexander Polcyn | 2017-03-24 |
* | | | | Merge pull request #7771 from y-zeng/cares_buildin | Yuchen Zeng | 2017-03-24 |
|\ \ \ \ | |_|/ / |/| | | | |||
* | | | | Merge pull request #10245 from sreecha/cq_factory_api | Sree Kuchibhotla | 2017-03-24 |
|\ \ \ \ | |||
| | | * \ | Merge branch 'master' of https://github.com/grpc/grpc into caching_with_uri | Makarand Dharmapurikar | 2017-03-24 |
| | | |\ \ | |_|_|/ / |/| | | | | |||
* | | | | | Merge pull request #10293 from nicolasnoble/upmerge-1.2.0 | Nicolas Noble | 2017-03-24 |
|\ \ \ \ \ | |||
* | | | | | | Add socket factory support to udp_server.c | Michael Warres | 2017-03-24 |
| * | | | | | Merge branch 'v1.2.x' of https://github.com/grpc/grpc into upmerge-1.2.0 | Nicolas "Pixel" Noble | 2017-03-24 |
|/| | | | | | | |_|_|/ | |/| | | | |||
| | | * | | Merge remote-tracking branch 'upstream/master' into cares_rebase | Yuchen Zeng | 2017-03-22 |
| | | |\ \ | |_|_|/ / |/| | | | | |||
| | | | * | added b64.c to the sources neede for grpc_base | Makarand Dharmapurikar | 2017-03-22 |
* | | | | | Merge pull request #9655 from markdroth/remove_initial_connect_string | Mark D. Roth | 2017-03-22 |
|\ \ \ \ \ | |||
| | | * | | | Add the new file to bazel BUILD file | Sree Kuchibhotla | 2017-03-21 |
| |_|/ / / |/| | | | | |||
* | | | | | Merge pull request #9850 from markdroth/retry_throttle | Mark D. Roth | 2017-03-21 |
|\ \ \ \ \ | |||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' into remove_initial_connect_st... | Mark D. Roth | 2017-03-21 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
| | | * | | | Going for 1.2.0 | David Garcia Quintas | 2017-03-20 |
| | | | * | | Fix uv, cmake, bazel build | Yuchen Zeng | 2017-03-20 |
| | | | * | | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | Yuchen Zeng | 2017-03-17 |
| | | | |\ \ | |_|_|_|/ / |/| | | | | | |||
| | | | * | | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | Yuchen Zeng | 2017-03-17 |
| | | | |\ \ | |||
* | | | | \ \ | Merge pull request #10123 from y-zeng/android | Yuchen Zeng | 2017-03-17 |
|\ \ \ \ \ \ \ | |||
| | | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into remove_initial_connect_st... | Mark D. Roth | 2017-03-17 |
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into retry_throttle | Mark D. Roth | 2017-03-17 |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||
| | * | | | | | | Switch to using a CAS loop to update the token value. | Mark D. Roth | 2017-03-17 |
* | | | | | | | | Merge pull request #10135 from ctiller/call_arena | Craig Tiller | 2017-03-16 |
|\ \ \ \ \ \ \ \ | |||
* | | | | | | | | | Add missing files | yang-g | 2017-03-16 |
| |_|_|_|_|_|_|/ |/| | | | | | | |