Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Add a timeout to shutdown to forcefully end calls | Craig Tiller | 2015-08-18 |
| | |||
* | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-17 |
|\ | |||
| * | Fixing zookeeper's installation. | Nicolas "Pixel" Noble | 2015-08-14 |
| | | |||
| * | Merge pull request #2549 from hongweiwang/zookeeper | David G. Quintas | 2015-08-14 |
| |\ | | | | | | | Zookeeper name resolver | ||
| * | | Regenerated project files | Robbie Shade | 2015-08-13 |
| | | | |||
| * | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: Makefile | ||
* | \ \ | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-13 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | Removing gpr_cancelable. | Nicolas "Pixel" Noble | 2015-08-13 |
| | | | | |||
* | | | | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-13 |
|\| | | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 |
| | |\ \ | | |/ / | |/| | | |||
| | | * | 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 |
| |\ \ \ | | | | | | | | | | | move auth property iterator declaration into auth_context.h | ||
| * \ \ \ | Merge pull request #2864 from jtattermusch/0.10-upport | Nicolas Noble | 2015-08-10 |
| |\ \ \ \ | | | | | | | | | | | | | Upporting from 0.10 branch. | ||
| | | * | | | move auth property iterator declaration into auth_context.h | yang-g | 2015-08-10 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'compression-accept-encoding' into compression-interop | David Garcia Quintas | 2015-08-09 |
|\ \ \ \ \ | |||
| * | | | | | Merge branch 'master' into compression-accept-encoding | David Garcia Quintas | 2015-08-09 |
| |\| | | | | |||
| | | | | * | 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 |
| | | | | | |\ | | | | |_|_|/ | | | |/| | | | |||
| | | | | * | | Regenerated Makefile | Robbie Shade | 2015-08-06 |
| | | | | |\ \ | | | | |_|/ / | | | |/| | | | |||
| | | * | | | | Merge pull request #2750 from ctiller/propagate | Yang Gao | 2015-08-06 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Core-supported context propagation | ||
| | | | | | * \ | Regenerated project files | Robbie Shade | 2015-08-06 |
| | | | | | |\ \ | | | | |_|_|/ / | | | |/| | | | | |||
| | | * | | | | | Merge pull request #2781 from yang-g/stuboptions | Abhishek Kumar | 2015-08-05 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add StubOptions | ||
| | * | | | | | | | 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 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Connection backoff interop test client and server | ||
| | | * \ \ \ \ \ \ | Merge pull request #2713 from ctiller/plucking-hell | Vijay Pai | 2015-08-05 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Allow specific pollers to be woken | ||
| | | | | | | | | | * | 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 ↵ | yang-g | 2015-08-05 |
| | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | reconnect_branch_based_on_jitter | ||
| | | * | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2ed6878412d54ad1a6509de45d6351a3f697bb48. | ||
| | * | | | | | | | | | | Revert "Fixing environments where pkg-config isn't installed." | Craig Tiller | 2015-08-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2ed6878412d54ad1a6509de45d6351a3f697bb48. | ||
| | * | | | | | | | | | | 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 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | Fixing environments where pkg-config isn't installed. | ||
| | | * | | | | | | | | | Merge pull request #2652 from nicolasnoble/tests-depend-on-openssl | Craig Tiller | 2015-08-04 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | The code evolved enough so that we now have tests that directly depend on OpenSSL | ||
| | * | | | | | | | | | | | Testing port server | Craig Tiller | 2015-08-04 |
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | run_tests.py will start a server (if it's not running, or if the running port server mismatches the 'current' one) that serves ports to use for tests. The server is left running after run_tests.py finishes, so that in environments such as Mac and Windows where tests run unshielded from each other, we don't start jumping on already used ports. | ||
| | | | * / / / / / / / | Fixing environments where pkg-config isn't installed. | Nicolas "Pixel" Noble | 2015-08-04 |
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depending on the presence of pkg-config, we're not necessarily doing the right thing in the Makefile. Zlib is a pkg-config dependency, but libm, libpthread, librt aren't. | ||
| | | | | | | | | | * | Add zookeeper test in Makefile | Hongwei Wang | 2015-08-04 |
| | | | | | | | | | | | |||
| | | | | | | * | | | | Add proxy tests to end2end suite | Craig Tiller | 2015-08-04 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the oauth2 variant of these tests is disabled. Will work with @jboeuf to figure out how to turn them on. | ||
| | | | | | * | | | | 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 |
| | | | |\ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile | ||
| | | | | | | | * | Add zookeeper end-to-end test | Hongwei Wang | 2015-07-31 |
| | | | | | | | | |