Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #10912 from dgquintas/trying-to-fix-stuff | David G. Quintas | 2017-05-04 |
|\ | |||
* | | Implement client-side load reporting for grpclb. | Mark D. Roth | 2017-05-02 |
* | | Merge pull request #10360 from dgquintas/grpclb_new_test | David G. Quintas | 2017-05-02 |
|\ \ | |||
| | * | Merge branch 'master' of github.com:grpc/grpc into trying-to-fix-stuff | David Garcia Quintas | 2017-05-01 |
| | |\ | |_|/ |/| | | |||
* | | | Remove leftover thrift mentions | David Garcia Quintas | 2017-05-01 |
| | * | Merge commit '3049460b75ac557348243601896ed68ca8145522' into master-upmerge-v... | David Garcia Quintas | 2017-04-28 |
| | |\ | |||
| | * | | Merge branch 'v1.3.x' into master-upmerge-v1.3.x | David Garcia Quintas | 2017-04-28 |
| |/| | |/| | | | |||
| * | | | New version of grpclb end2end test | David Garcia Quintas | 2017-04-27 |
|/ / / | |||
* | | | Merge pull request #10522 from jiangtaoli2016/new_tsi | David G. Quintas | 2017-04-27 |
|\ \ \ | |||
* \ \ \ | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-26 |
|\ \ \ \ | |||
| * \ \ \ | Merge pull request #10805 from dgquintas/g_for_1.4.x | David G. Quintas | 2017-04-26 |
| |\ \ \ \ | |||
| | | | | * | Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv | murgatroid99 | 2017-04-25 |
| | | | | |\ | |||
| | | | | | * | Merge branch 'master' into v1.3.x | Yuchen Zeng | 2017-04-25 |
| | | | | |/| | | | | |/|/ | | |_|_|/| | |/| | | | | |||
| | | * | | | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-25 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #10826 from ctiller/ubsan | Craig Tiller | 2017-04-24 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #10644 from MakMukhi/master | MakMukhi | 2017-04-24 |
| |\ \ \ \ \ \ | |||
| | | * | | | | | Slow down timers for ubsan builds | Craig Tiller | 2017-04-24 |
| | |/ / / / / | |/| | | | | | |||
| | | | | | * | Remove non-libuv code from Node extension | murgatroid99 | 2017-04-24 |
| | | | | |/ | |||
* | | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-24 |
|\| | | | | | |||
| | | | * | | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-24 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | * | | | updated g meaning for 1.4.x | David Garcia Quintas | 2017-04-21 |
| | |/ / / | |/| | | | |||
| * | | | | Merge pull request #10742 from markdroth/hash_table | Mark D. Roth | 2017-04-21 |
| |\ \ \ \ | |||
* | | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-21 |
|\| | | | | | |||
| * | | | | | Merge pull request #10762 from ctiller/c++compat | Craig Tiller | 2017-04-20 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #10751 from ctiller/speedup-build | Craig Tiller | 2017-04-20 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge pull request #10182 from ctiller/cpparena | Craig Tiller | 2017-04-20 |
| |\ \ \ \ \ \ \ | |||
| | | * | | | | | | Speed up tests | Craig Tiller | 2017-04-19 |
| * | | | | | | | | Merge remote-tracking branch 'upstream/v1.3.x' into upmerge_v1.3.x | murgatroid99 | 2017-04-19 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-19 |
|\| | | | | | | | | |||
| | | * | | | | | | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-19 |
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
| | | | | * | | | | Change hash table to use linear probing and add unit test. | Mark D. Roth | 2017-04-19 |
| | | | | | * | | | trial and error | Mahak Mukhi | 2017-04-18 |
| | | | | | * | | | trial and error | Mahak Mukhi | 2017-04-18 |
| | | | | | | | * | c-ares mingw32 support | Yuchen Zeng | 2017-04-18 |
| | | |_|_|_|_|/ | | |/| | | | | | |||
| | | * | | | | | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-18 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||
| * | | / | | | | Remove status_helper as it is not needed any more | yang-g | 2017-04-18 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-17 |
|\| | | | | | | |||
| | | | | * | | more sanity | Mahak Mukhi | 2017-04-15 |
| * | | | | | | Improvements to Fake Resolver | David Garcia Quintas | 2017-04-15 |
| | | | | | * | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-15 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| | | | | * | | 1. Added golden file test. | Mahak Mukhi | 2017-04-14 |
* | | | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-14 |
|\| | | | | | | |||
| | * | | | | | PHP: add ares as deps | Stanley Cheung | 2017-04-14 |
| | | * | | | | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-14 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #9972 from sreecha/cq_create_api_changes | Sree Kuchibhotla | 2017-04-14 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge github.com:grpc/grpc into minimal_test | Craig Tiller | 2017-04-13 |
| |\ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-04-13 |
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||
| | | * | | | | | | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-04-13 |
| | | |\ \ \ \ \ \ | |||
| | * | | | | | | | | master to 1.4.0-dev | David Garcia Quintas | 2017-04-13 |
| | | |/ / / / / / | | |/| | | | | | | |||
| | | | * | | | | | 1.3.x branch cut | David Garcia Quintas | 2017-04-13 |
| | | |/ / / / / | | |/| | | | | |