Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into timespec | Hongyu Chen | 2015-08-25 |
|\ | |||
| * | add missing headers from 2495 | yang-g | 2015-08-25 |
| * | Merge pull request #2945 from maxwell-demon/master | Alistair Veitch | 2015-08-25 |
| |\ | |||
| * \ | Merge branch 'master' of github.com:grpc/grpc into cpp_string_ref | Julien Boeuf | 2015-08-24 |
| |\ \ | |||
| * | | | Adding grpc::string_ref class. | Julien Boeuf | 2015-08-24 |
* | | | | Move core/profiling/timers_preciseclock.h to core/support/ such that we | Hongyu Chen | 2015-08-24 |
| | * | | Fix merge failures | yang-g | 2015-08-24 |
| | * | | merge with head | yang-g | 2015-08-24 |
| | |\ \ | |||
| | | * \ | 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 |
| |_|/ / / |/| | | | | |||
| | * | | | split stream.h into sync_stream.h and async_stream.h | yang-g | 2015-08-21 |
| | * | | | headers reorg | yang-g | 2015-08-21 |
| | | | * | rename census_filter.{c,h} to grpc_filter.{c,h} | Hongyu Chen | 2015-08-21 |
| | | * | | Added C API functions for compression args handling (w/ tests) | David Garcia Quintas | 2015-08-21 |
| |_|/ / |/| | | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into docs | yang-g | 2015-08-20 |
| | |\ \ | |_|/ / |/| | | | |||
| | * | | Make Channel ctor private | yang-g | 2015-08-20 |
| | * | | remove internal_stub | yang-g | 2015-08-20 |
| | | * | Merge remote-tracking branch 'upstream/master' | Hongyu Chen | 2015-08-20 |
| | | |\ | |_|_|/ |/| | | | |||
| | | * | Move census_filters from .../channel to .../census | Hongyu Chen | 2015-08-19 |
| | * | | Remove ChannelInterface and replace it with Channel | yang-g | 2015-08-19 |
* | | | | 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 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 |
* | | | | | 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 remote-tracking branch 'upstream/master' | Hongyu Chen | 2015-08-11 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | | * | Build file changes | Hongyu Chen | 2015-08-11 |
| | | * | | 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 '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 |
| | | |\ \ \ | |||
| | | | | * \ | 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 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 |
| | | |\ \ \ \ \ | |||
| | * | | | | | | | 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 |
| | | |_|/ / / | | |/| | | | |