Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | Craig Tiller | 2015-08-06 |
|\ | |||
| * | Merge pull request #2800 from ctiller/reduce-mac-load | Nicolas Noble | 2015-08-06 |
| |\ | | | | | | | Reduce mac load on Jenkins | ||
| * \ | Merge pull request #2783 from ctiller/tracing-takes-time | Nicolas Noble | 2015-08-06 |
| |\ \ | | | | | | | | | Allow fixtures to specify slowdown factors, use it for grpc_trace tests | ||
| * | | | Add tests for C++ propagation | Craig Tiller | 2015-08-05 |
| | | | | |||
* | | | | Fix integration breakage | Craig Tiller | 2015-08-05 |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | Craig Tiller | 2015-08-05 |
|\ \ \ \ | |||
| | | | * | Merge branch 'propagate' into reduce-mac-load | Craig Tiller | 2015-08-05 |
| | | | |\ | | | |_|/ | | |/| | | |||
| | * | | | Fix integration breakage | Craig Tiller | 2015-08-05 |
| | | | | | |||
| | * | | | Merge github.com:grpc/grpc into propagate | Craig Tiller | 2015-08-05 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | * | | | Merge github.com:grpc/grpc into propagate | Craig Tiller | 2015-08-05 |
| | |\ \ \ | |||
| * | | | | | Fix integration breakage | 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 #2765 from ctiller/the-test-be-sleepy | Yang Gao | 2015-08-05 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix edge cases in CHTTP2 resulting in lose of send close from clients | ||
| * \ \ \ \ \ | Merge pull request #2808 from a11r/status_interop | Yang Gao | 2015-08-05 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added interop test for status_code_with_message | ||
| * \ \ \ \ \ \ | Merge pull request #2713 from ctiller/plucking-hell | Vijay Pai | 2015-08-05 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Allow specific pollers to be woken | ||
| | | * | | | | | | Added interop test for status_code_with_message | Abhishek Kumar | 2015-08-05 |
| | | | | | | | | | |||
| | | | | | * | | | Merge github.com:grpc/grpc into propagate | Craig Tiller | 2015-08-05 |
| | | | | | |\ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||
| | | | | | * | | | Cleanup unnecessary test | Craig Tiller | 2015-08-05 |
| | | | | | | | | | |||
| | | | | | * | | | Fix proxy, finalize API | Craig Tiller | 2015-08-05 |
| | | | | | | | | | |||
| * | | | | | | | | Merge pull request #2767 from ctiller/no-poop-on-pizza | Abhishek Kumar | 2015-08-05 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Rename grpc_server_add_http2_port to grpc_server_add_insecure_http2_port | ||
| | | | | | * \ \ \ | Merge remote-tracking branch 'upstream/master' into ↵ | yang-g | 2015-08-05 |
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reconnect_branch_based_on_jitter | ||
| | | | | | | | | | * | Merge branch 'propagate' into reduce-mac-load | Craig Tiller | 2015-08-05 |
| | | | | | | | | | |\ | | | | | | | | | |_|/ | | | | | | | | |/| | | |||
| | | | | | | | * | | | Merge github.com:grpc/grpc into propagate | Craig Tiller | 2015-08-05 |
| | | | | | | | |\ \ \ | | | | | | | | |/ / / | | | | | | | |/| | | | |||
| | | | | | | | | | * | Add linux, mac as test platforms, only run _with_poll tests on linux | Craig Tiller | 2015-08-05 |
| | | | | | | | | |/ | | | | | | | | |/| | |||
* | | | | | | | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | Craig Tiller | 2015-08-05 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||
| | | | | | * | | | | Merge branch 'primary-goat-whisperer' into the-test-be-sleepy | Craig Tiller | 2015-08-05 |
| | | | | | |\ \ \ \ | |||
| | | | | | | * | | | | Merge github.com:grpc/grpc into primary-goat-whisperer | Craig Tiller | 2015-08-05 |
| | | | | |_|/| | | | | | | | |/| |/ / / / | | |_|_|_|/| | | | | |/| | | | | | | | | |||
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into cancel | yang-g | 2015-08-04 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge pull request #2791 from pmarks-net/uri | Craig Tiller | 2015-08-04 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Return normalized IPv4 addresses from grpc_sockaddr_to_uri(). | ||
| | * | | | | | | | | | Return normalized IPv4 addresses from grpc_sockaddr_to_uri(). | Paul Marks | 2015-08-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users of the high-level API should not care whether we're using AF_INET or AF_INET6 sockets internally. | ||
| | | * | | | | | | | | Add AsyncNotifyWhenDone | yang-g | 2015-08-04 |
| | |/ / / / / / / / | |||
| * | | | | | | | | | Merge pull request #2749 from yang-g/default_host_to_null | Craig Tiller | 2015-08-04 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | Pass NULL as host by default. Use context.authority() or channel.SslN… | ||
* / | | | | | | | | | 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. | ||
| | | | | * | | | | Merge branch 'primary-goat-whisperer' into the-test-be-sleepy | Craig Tiller | 2015-08-04 |
| | | | | |\ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | |||
| | | | | | | | * | Allow fixtures to specify slowdown factors, use it for grpc_trace tests | Craig Tiller | 2015-08-04 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||
| | | * | | | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 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. | ||
| | | | | | * | | merge with head and resolve conflicts | yang-g | 2015-08-03 |
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||
* | | | | | | | | Merge pull request #2766 from ctiller/alpnrggg | Yang Gao | 2015-08-03 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix alpn_test | ||
* \ \ \ \ \ \ \ \ | Merge pull request #2702 from yang-g/peeraddr | Vijay Pai | 2015-08-03 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | Add accessor peer() in ClientContext and ServerContext | ||
| | | | * | | | | | Rename grpc_server_add_http2_port to grpc_server_add_insecure_http2_port | Craig Tiller | 2015-08-03 |
| |_|_|/ / / / / |/| | | | | | | | |||
| | * | | | | | | Fix alpn_test | Craig Tiller | 2015-08-03 |
| |/ / / / / / |/| | | | | | | |||
| | | | * | | | Re-enable all the tests | Craig Tiller | 2015-08-03 |
| | | | | | | | |||
* | | | | | | | Merge pull request #2751 from ctiller/alphanumeric-juju-fish | Michael Lumish | 2015-08-03 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove optional parameter from watch connectivity state | ||
| | | | | * \ \ | Merge branch 'plucking-hell' into the-test-be-sleepy | Craig Tiller | 2015-08-03 |
| | | | | |\ \ \ | | | | | |/ / / | | | | |/| | | | |||
| | | | * | | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-08-01 |
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile | ||
| | | | | | | * | Merge branch 'propagate' of github.com:ctiller/grpc into propagate | Craig Tiller | 2015-08-01 |
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/surface/channel.c | ||
| | | | | | | * \ | Merge github.com:grpc/grpc into propagate | Craig Tiller | 2015-08-01 |
| | | | | | | |\ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/surface/channel.c | ||
| | | * | | | | | | fix generic_end2end_test | yang-g | 2015-07-31 |
| |_|/ / / / / / |/| | | | | | | | |||
| * | | | | | | | Fix UDS versions of this test | Craig Tiller | 2015-07-31 |
| | | | | | | | |