Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Fix merge failures | 2015-08-24 | |
| | |||
* | merge with head | 2015-08-24 | |
|\ | |||
| * | Merge branch 'master' into fray | 2015-08-24 | |
| |\ | |||
| | * | Merge pull request #3019 from dgquintas/channel_args_compression | 2015-08-24 | |
| | |\ | | | | | | | | | Added C API functions for compression args handling (w/ tests) | ||
| | * | | Remove accidental dependency on zookeeper in shutdown_test | 2015-08-24 | |
| | | | | |||
| * | | | Eliminate public thread-pool interface | 2015-08-24 | |
| |/ / | |||
* | | | split stream.h into sync_stream.h and async_stream.h | 2015-08-21 | |
| | | | |||
* | | | headers reorg | 2015-08-21 | |
| | | | |||
| | * | Added C API functions for compression args handling (w/ tests) | 2015-08-21 | |
| |/ | |||
* | | Merge remote-tracking branch 'upstream/master' into docs | 2015-08-20 | |
|\| | |||
* | | Make Channel ctor private | 2015-08-20 | |
| | | |||
* | | remove internal_stub | 2015-08-20 | |
| | | |||
| * | Merge pull request #2977 from ctiller/shutdown-c++ | 2015-08-19 | |
| |\ | | | | | | | Add a deadline to Server::Shutdown | ||
* | | | Remove ChannelInterface and replace it with Channel | 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 | |
| |\ | | | | | | | Zookeeper name resolver | ||
| * \ | Merge pull request #2376 from rjshade/add_udp_server_2 | 2015-08-13 | |
| |\ \ | | | | | | | | | Add UDP server to gRPC. | ||
| * | | | Recreating grpc_test_util_unsecure's template. | 2015-08-14 | |
| | | | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | 2015-08-13 | |
| | |\ \ | | |/ / | |/| | | | | | | | | | | Conflicts: Makefile | ||
* | | | | Merge branch 'master' of github.com:grpc/grpc into compression-interop | 2015-08-13 | |
|\| | | | |||
| * | | | Removing gpr_cancelable. | 2015-08-13 | |
| | | | | |||
* | | | | Updated outdated Grpc.mak | 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 | |
| | | |\ | | |_|/ | |/| | | |||
| * | | | move auth property iterator declaration into auth_context.h | 2015-08-10 | |
| | | | | |||
* | | | | 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 github.com:grpc/grpc into kinetic-lopsided-poetry | 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 | |
| | |\ \ \ | | | | | | | | | | | | | Core-supported context propagation | ||
| | | | * \ | Regenerated project files | 2015-08-06 | |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| | * | | | | Merge pull request #2781 from yang-g/stuboptions | 2015-08-05 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | Add StubOptions | ||
| * | | | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | 2015-08-05 | |
| |\| | | | | | |||
| | * | | | | | Merge pull request #2797 from jtattermusch/polishing_api | 2015-08-05 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | C# API improvements | ||
| | | | | | | * | 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 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Connection backoff interop test client and server | ||
| | | | * | | | | | updated .gitignore | 2015-08-04 | |
| | | | | | | | | | |||
| * | | | | | | | | Testing port server | 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. | ||
| | | | | * | | | Add proxy tests to end2end suite | 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 | 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 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | Conflicts: Makefile | ||
| | | | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-07-31 | |
| | | | | |\ | |||
| | | | | * | | Add zookeeper end-to-end test | 2015-07-31 | |
| | | | | | | |