Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-10 |
|\ | |||
| * | Merge pull request #2875 from yang-g/test_unsecure | Nicolas Noble | 2015-08-10 |
| |\ | |||
| * \ | Merge pull request #2864 from jtattermusch/0.10-upport | Nicolas Noble | 2015-08-10 |
| |\ \ | |||
| | | * | move auth property iterator declaration into auth_context.h | yang-g | 2015-08-10 |
| | |/ | |/| | |||
* | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-07 |
|\| | | |||
| * | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | Craig Tiller | 2015-08-06 |
| |\ \ | |||
* | \ \ | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-06 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #2750 from ctiller/propagate | Yang Gao | 2015-08-06 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #2781 from yang-g/stuboptions | Abhishek Kumar | 2015-08-05 |
| |\ \ \ \ | |||
| | | | * \ | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | Craig Tiller | 2015-08-05 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
* | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-05 |
|\| | | | | | |||
| | | * | | | Merge github.com:grpc/grpc into propagate | Craig Tiller | 2015-08-05 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #2656 from yang-g/reconnect_branch_based_on_jitter | Vijay Pai | 2015-08-05 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #2713 from ctiller/plucking-hell | Vijay Pai | 2015-08-05 |
| |\ \ \ \ \ \ | |||
* | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-05 |
|\| | | | | | | | |||
| | | | | * | | | Cleanup unnecessary test | Craig Tiller | 2015-08-05 |
| | | | * | | | | regenerate projects | yang-g | 2015-08-05 |
| | | | * | | | | Merge remote-tracking branch 'upstream/master' into stuboptions | yang-g | 2015-08-05 |
| | | | |\ \ \ \ | |||
| | | * | | | | | | regenerate projects | yang-g | 2015-08-05 |
| | | * | | | | | | Merge remote-tracking branch 'upstream/master' into reconnect_branch_based_on... | yang-g | 2015-08-05 |
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | |||
| * | | | | | | | | regenerate projects | yang-g | 2015-08-05 |
| | | | | | * | | | Merge github.com:grpc/grpc into propagate | Craig Tiller | 2015-08-05 |
| | | | | | |\ \ \ | | | | | |_|/ / / | | | | |/| | | | | |||
| | | | * | | | | | Revert "Fixing environments where pkg-config isn't installed." | Craig Tiller | 2015-08-05 |
| | | | | | | * | | Revert "Fixing environments where pkg-config isn't installed." | Craig Tiller | 2015-08-05 |
| | | | | | | * | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | Craig Tiller | 2015-08-05 |
| | | | | | | |\ \ | | | | | |_|_|/ / | | | | |/| | | | | |||
| | | | * | | | | | Merge pull request #2787 from nicolasnoble/no-pkgconfig-is-broken | Craig Tiller | 2015-08-04 |
| | |_|/| | | | | | |/| | | | | | | | |||
| * | | | | | | | | Merge pull request #2652 from nicolasnoble/tests-depend-on-openssl | Craig Tiller | 2015-08-04 |
| |\ \ \ \ \ \ \ \ | |||
| | | | | | | | * | | Testing port server | Craig Tiller | 2015-08-04 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||
| | | | | * | | | | Fixing environments where pkg-config isn't installed. | Nicolas "Pixel" Noble | 2015-08-04 |
| | |_|_|/ / / / | |/| | | | | | | |||
* | | | | | | | | Add zookeeper test in Makefile | Hongwei Wang | 2015-08-04 |
| | | | | | * | | Add proxy tests to end2end suite | Craig Tiller | 2015-08-04 |
| | |_|_|_|/ / | |/| | | | | | |||
| | | | | * | | Add StubOptions | yang-g | 2015-08-03 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-03 |
|\| | | | | | |||
| | | | * | | merge with head and resolve conflicts | yang-g | 2015-08-03 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | * | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-08-01 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
* | | | | | | Add zookeeper end-to-end test | Hongwei Wang | 2015-07-31 |
| | | | | * | bump C# version to 0.6.1 and core version to 0.10.1 | Jan Tattermusch | 2015-07-31 |
| * | | | | | Exclude uds from default hostname tests | Craig Tiller | 2015-07-29 |
| * | | | | | Add a subchannel factory decorator library | Craig Tiller | 2015-07-29 |
| | | * | | | Allow specific pollers to be woken | Craig Tiller | 2015-07-29 |
| | | | |/ | | | |/| | |||
* | | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-07-28 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||
| | | | * | merge with upstream | yang-g | 2015-07-28 |
| | | | |\ | | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'iomgr-refcounting' of https://github.com/nicolasnoble/grpc into... | Hongwei Wang | 2015-07-27 |
|\ \ \ \ \ | |||
| | | * \ \ | Merge branch 'sometimes-its-good-just-to-check-in-with-each-other' into yeah-... | Craig Tiller | 2015-07-26 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||
| | * | | | | Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each... | Craig Tiller | 2015-07-26 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #2647 from vjpai/deepend | Yang Gao | 2015-07-24 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #2605 from yang-g/fake_transport_security_to_private | jboeuf | 2015-07-24 |
| |\ \ \ \ \ \ | |||
| | | | | | | * | Add reconnect interop test client and server | yang-g | 2015-07-24 |
| | | | | |_|/ | | | | |/| | | |||
| | | | | | * | The code evolved enough so that we now have tests that directly depend on Ope... | Nicolas "Pixel" Noble | 2015-07-24 |
| | |_|_|_|/ | |/| | | | | |||
| | | * | | | Merge branch 'master' into deepend | Vijay Pai | 2015-07-24 |
| | | |\ \ \ | | |_|/ / / | |/| | | | |