Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into fray | 2015-08-24 | |
|\ | |||
| * | Merge pull request #3019 from dgquintas/channel_args_compression | 2015-08-24 | |
| |\ | |||
| * | | Remove accidental dependency on zookeeper in shutdown_test | 2015-08-24 | |
* | | | Eliminate public thread-pool interface | 2015-08-24 | |
|/ / | |||
| * | Added C API functions for compression args handling (w/ tests) | 2015-08-21 | |
|/ | |||
* | Merge pull request #2995 from ctiller/timewhat | 2015-08-19 | |
|\ | |||
* \ | Merge pull request #2977 from ctiller/shutdown-c++ | 2015-08-19 | |
|\ \ | |||
| | * | Exclude qps_test from tsan runs | 2015-08-19 | |
| |/ |/| | |||
* | | disable grpc_zookeeper target on windows | 2015-08-18 | |
| * | Add a timeout to shutdown to forcefully end calls | 2015-08-18 | |
|/ | |||
* | Merge branch 'master' of github.com:grpc/grpc into compression-interop | 2015-08-17 | |
|\ | |||
| * | Merge pull request #2549 from hongweiwang/zookeeper | 2015-08-14 | |
| |\ | |||
| * \ | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | 2015-08-13 | |
| |\ \ | |||
* | \ \ | Merge branch 'master' of github.com:grpc/grpc into compression-interop | 2015-08-13 | |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | Removing gpr_cancelable. | 2015-08-13 | |
* | | | | Merge branch 'master' of github.com:grpc/grpc into compression-interop | 2015-08-13 | |
|\| | | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | 2015-08-13 | |
| | |\ \ | | |/ / | |/| | | |||
| | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-10 | |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #2875 from yang-g/test_unsecure | 2015-08-10 | |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #2864 from jtattermusch/0.10-upport | 2015-08-10 | |
| |\ \ \ \ | |||
| | | * | | | move auth property iterator declaration into auth_context.h | 2015-08-10 | |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'compression-accept-encoding' into compression-interop | 2015-08-09 | |
|\ \ \ \ \ | |||
| * | | | | | Merge branch 'master' into compression-accept-encoding | 2015-08-09 | |
| |\| | | | | |||
| | | | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-07 | |
| | | | | |\ | | | |_|_|/ | | |/| | | | |||
| | | | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-06 | |
| | | | | |\ | |||
| | * | | | \ | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | 2015-08-06 | |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||
| | | * | | | | Merge pull request #2800 from ctiller/reduce-mac-load | 2015-08-06 | |
| | | |\ \ \ \ | |||
| | | | | | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-06 | |
| | | | | | | |\ | | | | |_|_|_|/ | | | |/| | | | | |||
| | | | | | * | | Regenerated Makefile | 2015-08-06 | |
| | | | | | |\ \ | | | | |_|_|/ / | | | |/| | | | | |||
| | | * | | | | | Merge pull request #2750 from ctiller/propagate | 2015-08-06 | |
| | | |\ \ \ \ \ | |||
| | | | | | | * \ | Regenerated project files | 2015-08-06 | |
| | | | | | | |\ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||
| | | * | | | | | | Merge pull request #2781 from yang-g/stuboptions | 2015-08-05 | |
| | | |\ \ \ \ \ \ | |||
| | * | | | | | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | 2015-08-05 | |
| | |\| | | | | | | | |||
| | | | | | * | | | | Merge branch 'propagate' into reduce-mac-load | 2015-08-05 | |
| | | | | | |\ \ \ \ | | | | | | |/ / / / | | | | | |/| | | | | |||
| | | | | | | | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-05 | |
| | | | | | | | | |\ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||
| | | | | * | | | | | Merge github.com:grpc/grpc into propagate | 2015-08-05 | |
| | | | | |\ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | |||
| | | * | | | | | | | Merge pull request #2656 from yang-g/reconnect_branch_based_on_jitter | 2015-08-05 | |
| | | |\ \ \ \ \ \ \ | |||
| | | | | | | * | | | | Add linux, mac as test platforms, only run _with_poll tests on linux | 2015-08-05 | |
| | | | | | |/ / / / | |||
| | * | | | | | | | | Testing port server | 2015-08-04 | |
| | | | | | * | | | | Add proxy tests to end2end suite | 2015-08-04 | |
| | | |_|_|/ / / / | | |/| | | | | | | |||
| | | | | * | | | | Add StubOptions | 2015-08-03 | |
| | | |_|/ / / / | | |/| | | | | | |||
| | | | | | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-03 | |
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | | | |||
| | | | * | | | | merge with head and resolve conflicts | 2015-08-03 | |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | | * | | | | | Merge github.com:grpc/grpc into plucking-hell | 2015-08-01 | |
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| | | | | | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-07-31 | |
| | | | | | | |\ | |||
| | | | | | | * | | Add zookeeper end-to-end test | 2015-07-31 | |
| | * | | | | | | | Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about | 2015-07-31 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||
| | | * | | | | | | Merge pull request #2731 from nicolasnoble/regen-and-vs-tweaks | 2015-07-30 | |
| | | |\ \ \ \ \ \ | |||
| | | | | | | * | | | bump C# version to 0.6.1 and core version to 0.10.1 | 2015-07-31 | |
| | | | |_|_|/ / / | | | |/| | | | | | |||
| | | | * | | | | | Regenerating project files and massaging VS project files. | 2015-07-30 |