Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | * | | Merge remote-tracking branch 'upstream/master' into cares_rebase | 2017-03-22 | ||
| | | |\ \ | |_|_|/ / |/| | | | | ||||
| | | | * | added b64.c to the sources neede for grpc_base | 2017-03-22 | ||
| | | | | | ||||
* | | | | | Merge pull request #9655 from markdroth/remove_initial_connect_string | 2017-03-22 | ||
|\ \ \ \ \ | | | | | | | | | | | | | Remove initial_connect_string hack. | |||
| | | * \ \ | Merge branch 'master' into cq_factory_api | 2017-03-21 | ||
| | | |\ \ \ | |_|_|/ / / |/| | | | | | ||||
| | | * | | | Introduce grpc_completion_queue_factory API | 2017-03-21 | ||
| | | | | | | | | | | | | | | | | | | | | | | | | Just the API and a bare-bone implementation | |||
* | | | | | | Merge pull request #9850 from markdroth/retry_throttle | 2017-03-21 | ||
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Retry throttling implementation. | |||
| | * | | | | Merge remote-tracking branch 'upstream/master' into ↵ | 2017-03-21 | ||
| | |\ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | remove_initial_connect_string | |||
| | | | * | | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | 2017-03-17 | ||
| | | | |\ \ | |_|_|_|/ / |/| | | | | | ||||
| | | | * | | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | 2017-03-17 | ||
| | | | |\ \ | ||||
* | | | | \ \ | Merge pull request #10123 from y-zeng/android | 2017-03-17 | ||
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix android build | |||
| | | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into ↵ | 2017-03-17 | ||
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | remove_initial_connect_string | |||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into retry_throttle | 2017-03-17 | ||
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||
| | * | | | | | | Switch to using a CAS loop to update the token value. | 2017-03-17 | ||
| | | | | | | | | ||||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into retry_throttle | 2017-03-15 | ||
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||
| * | | | | | | | Resolve dependency issues | 2017-03-14 | ||
| | | | | | | | | ||||
| * | | | | | | | Split ifaddr related functions out into a separate file | 2017-03-13 | ||
| | |/ / / / / | |/| | | | | | ||||
* / | | | | | | Arena allocator for grpc | 2017-03-12 | ||
|/ / / / / / | ||||
| | | * / / | Switch Node back to using libuv iomgr by default | 2017-03-09 | ||
| |_|/ / / |/| | | | | ||||
* | | | | | Merge remote-tracking branch 'upstream/v1.1.x' into 1.1.x_to_master_again | 2017-03-06 | ||
|\ \ \ \ \ | ||||
| * | | | | | Add option to recompile Node library without ALPN support | 2017-03-02 | ||
| | | | | | | ||||
| | * | | | | Merge remote-tracking branch 'upstream/master' into retry_throttle | 2017-03-01 | ||
| | |\ \ \ \ | |_|/ / / / |/| | | | | | ||||
* | | | | | | Merge pull request #9888 from murgatroid99/electron_uv_fix | 2017-03-01 | ||
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Fix missing wakeups when using the libuv iomgr under Electron | |||
| * | | | | | Fix missing wakeups when using the libuv iomgr under Electron | 2017-02-27 | ||
| |/ / / / | ||||
* | | | | | Merge remote-tracking branch 'upstream/v1.1.x' into merge_1.1.x_master | 2017-02-23 | ||
|\| | | | | ||||
| | * | | | Retry throttling implementation. | 2017-02-23 | ||
| | | | | | ||||
| * | | | | Fix segfault in Node server destructor | 2017-02-22 | ||
| | | | | | ||||
| * | | | | Improve Node and libuv testing and test coverage | 2017-02-17 | ||
| | | | | | | | | | | | | | | | | | | | | Allow Node tests to run with or without UV, change default version to 7, add some portability tests. Also make some more core tests work with libuv | |||
* | | | | | Merge remote-tracking branch 'google/v1.1.x' | 2017-02-13 | ||
|\| | | | | |/ / / |/| | | | ||||
| | * | | Remove initial_connect_string hack. | 2017-02-09 | ||
| |/ / |/| | | ||||
| | * | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | 2017-02-08 | ||
| | |\ | |_|/ |/| | | ||||
* | | | Secure naming support for gRPCLB | 2017-02-07 | ||
| | | | ||||
| * | | Disable libuv core changes in Node library | 2017-02-06 | ||
| | | | ||||
| | * | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | 2017-01-31 | ||
| | |\ | ||||
* | | \ | Merge branch 'bm_countwrites' into bwest | 2017-01-27 | ||
|\ \ \ \ | | |_|/ | |/| | | ||||
* | | | | Merge github.com:grpc/grpc into bwest | 2017-01-26 | ||
|\ \ \ \ | ||||
| | * \ \ | Merge branch 'cp' into rollfwd | 2017-01-26 | ||
| | |\ \ \ | | |/ / / | |/| | | | ||||
| | | | * | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | 2017-01-25 | ||
| | | | |\ | | |_|_|/ | |/| | | | ||||
| | | | * | Disable async resolve for GRPC_UV | 2017-01-25 | ||
| | | | | | ||||
| * | | | | Merge pull request #9372 from markdroth/proxy_mapper | 2017-01-25 | ||
| |\ \ \ \ | | | | | | | | | | | | | Add proxy mapper hook. | |||
| * \ \ \ \ | Merge pull request #9383 from markdroth/http_connect_channel_arg | 2017-01-25 | ||
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Trigger HTTP CONNECT handshaker via channel args. | |||
| | | | | * | Remove fallback files | 2017-01-23 | ||
| | | | | | | ||||
| | | | | * | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | 2017-01-23 | ||
| | | | | |\ | | |_|_|_|/ | |/| | | | | ||||
| | | | | * | Migrate to the new c-ares dir | 2017-01-23 | ||
| | | | | | | ||||
| | | | * | | Revert "Revert "Metadata handling rewrite"" | 2017-01-23 | ||
| | |_|/ / | |/| | | | | | | | | | | | | | This reverts commit 5e01e2ac977655aa074faf7fde0a74298f5e4c55. | |||
| * | | | | Revert "Metadata handling rewrite" | 2017-01-20 | ||
| | | | | | ||||
| * | | | | Merge pull request #9340 from stanley-cheung/update-boringssl | 2017-01-20 | ||
| |\ \ \ \ | | | | | | | | | | | | | Update boringssl | |||
* | | | | | | Merge github.com:grpc/grpc into bwest | 2017-01-20 | ||
|\| | | | | | ||||
| | * | | | | Update boringssl to latest chromium-stable | 2017-01-20 | ||
| | | | | | | ||||
| | | | | * | Merge remote-tracking branch 'upstream/master' into cares_buildin | 2017-01-18 | ||
| | | | | |\ | | | |_|_|/ | | |/| | | | ||||
| | | * | | | Move detection of HTTP CONNECT proxy from DNS resolver to client channel. | 2017-01-18 | ||
| | |/ / / |