Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into fray | Vijay Pai | 2015-08-24 |
|\ | |||
| * | Merge pull request #3019 from dgquintas/channel_args_compression | Yang Gao | 2015-08-24 |
| |\ | |||
| * | | Remove accidental dependency on zookeeper in shutdown_test | Craig Tiller | 2015-08-24 |
* | | | Eliminate public thread-pool interface | Vijay Pai | 2015-08-24 |
|/ / | |||
| * | Added C API functions for compression args handling (w/ tests) | David Garcia Quintas | 2015-08-21 |
|/ | |||
* | Merge pull request #2977 from ctiller/shutdown-c++ | Yang Gao | 2015-08-19 |
|\ | |||
* | | disable grpc_zookeeper target on windows | Jan Tattermusch | 2015-08-18 |
| * | 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 |
|\ | |||
| * | Merge pull request #2549 from hongweiwang/zookeeper | David G. Quintas | 2015-08-14 |
| |\ | |||
| * \ | Merge pull request #2376 from rjshade/add_udp_server_2 | Yang Gao | 2015-08-13 |
| |\ \ | |||
| * | | | Recreating grpc_test_util_unsecure's template. | Nicolas "Pixel" Noble | 2015-08-14 |
| | * | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 |
| | |\ \ | | |/ / | |/| | | |||
* | | | | 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 |
* | | | | Updated outdated Grpc.mak | David Garcia Quintas | 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 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | move auth property iterator declaration into auth_context.h | yang-g | 2015-08-10 |
* | | | | 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 |
| | |\ \ \ | |||
| | | | * \ | Regenerated project files | Robbie Shade | 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 pull request #2797 from jtattermusch/polishing_api | Jan Tattermusch | 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 |
| | |\ \ \ \ \ \ | |||
| | | | * | | | | | updated .gitignore | Jan Tattermusch | 2015-08-04 |
| * | | | | | | | | Testing port server | Craig Tiller | 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 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-07-31 |
| | | | | |\ | |||
| | | | | * | | Add zookeeper end-to-end test | Hongwei Wang | 2015-07-31 |
| * | | | | | | Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about | Craig Tiller | 2015-07-31 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||
| | | * | | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-07-31 |
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | * | | | | | Merge pull request #2731 from nicolasnoble/regen-and-vs-tweaks | Jan Tattermusch | 2015-07-30 |
| | |\ \ \ \ \ | |||
| | | * | | | | | Regenerating project files and massaging VS project files. | Nicolas Noble | 2015-07-30 |
| | | | * | | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-07-30 |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | | | * | | | | Merge branch 'regen-and-vs-tweaks' of github.com:nicolasnoble/grpc into tepid... | Craig Tiller | 2015-07-30 |
| | | | |\ \ \ \ | |||
| | | | | * | | | | Regenerating project files and massaging VS project files. | Nicolas Noble | 2015-07-31 |
| | | | |/ / / / | | | |/| | | | | |||
| | * | | | | | | merge with master, fix build issue | Alistair Veitch | 2015-07-30 |