Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/v1.1.x' into 1.1.x_to_master_again | David Garcia Quintas | 2017-03-06 |
|\ | |||
| * | Add option to recompile Node library without ALPN support | murgatroid99 | 2017-03-02 |
| | | |||
* | | Merge pull request #9888 from murgatroid99/electron_uv_fix | Michael Lumish | 2017-03-01 |
|\ \ | | | | | | | Fix missing wakeups when using the libuv iomgr under Electron | ||
| * | | Fix missing wakeups when using the libuv iomgr under Electron | murgatroid99 | 2017-02-27 |
| |/ | |||
* | | Merge remote-tracking branch 'upstream/v1.1.x' into merge_1.1.x_master | murgatroid99 | 2017-02-23 |
|\| | |||
| * | Fix segfault in Node server destructor | murgatroid99 | 2017-02-22 |
| | | |||
| * | Improve Node and libuv testing and test coverage | murgatroid99 | 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' | Nicolas "Pixel" Noble | 2017-02-13 |
|\| | |||
* | | Secure naming support for gRPCLB | David Garcia Quintas | 2017-02-07 |
| | | |||
| * | Disable libuv core changes in Node library | murgatroid99 | 2017-02-06 |
| | | |||
* | | Merge branch 'bm_countwrites' into bwest | Craig Tiller | 2017-01-27 |
|\ \ | |||
* \ \ | Merge github.com:grpc/grpc into bwest | Craig Tiller | 2017-01-26 |
|\ \ \ | |||
| | * \ | Merge branch 'cp' into rollfwd | Craig Tiller | 2017-01-26 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #9372 from markdroth/proxy_mapper | Mark D. Roth | 2017-01-25 |
| |\ \ \ | | | | | | | | | | | Add proxy mapper hook. | ||
| * \ \ \ | Merge pull request #9383 from markdroth/http_connect_channel_arg | Mark D. Roth | 2017-01-25 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Trigger HTTP CONNECT handshaker via channel args. | ||
| | | | * | Revert "Revert "Metadata handling rewrite"" | Craig Tiller | 2017-01-23 |
| | |_|/ | |/| | | | | | | | | | | This reverts commit 5e01e2ac977655aa074faf7fde0a74298f5e4c55. | ||
| * | | | Revert "Metadata handling rewrite" | Craig Tiller | 2017-01-20 |
| | | | | |||
| * | | | Merge pull request #9340 from stanley-cheung/update-boringssl | Nicolas Noble | 2017-01-20 |
| |\ \ \ | | | | | | | | | | | Update boringssl | ||
* | | | | | Merge github.com:grpc/grpc into bwest | Craig Tiller | 2017-01-20 |
|\| | | | | |||
| | * | | | Update boringssl to latest chromium-stable | Stanley Cheung | 2017-01-20 |
| | | | | | |||
| | | * | | Move detection of HTTP CONNECT proxy from DNS resolver to client channel. | Mark D. Roth | 2017-01-18 |
| | |/ / | |||
| | | * | Add proxy mapper hook. | Mark D. Roth | 2017-01-17 |
| | |/ | |||
* | | | Merge github.com:grpc/grpc into bwest | Craig Tiller | 2017-01-17 |
|\ \ \ | | |/ | |/| | |||
| | * | Merge github.com:grpc/grpc into metadata_filter | Craig Tiller | 2017-01-17 |
| | |\ | | |/ | |/| | |||
| * | | Fix binding.gyp syntax | murgatroid99 | 2017-01-13 |
| | | | |||
| * | | Fix electron artifact builds | murgatroid99 | 2017-01-13 |
| | | | |||
* | | | Merge github.com:grpc/grpc into bwest | Craig Tiller | 2017-01-13 |
|\ \ \ | |||
| | * | | Do not use OPENSSL_NO_THREAD normally for Node on Windows | Michael Lumish | 2017-01-12 |
| | | | | |||
| | * | | Merge branch 'master' into node_electron_build | murgatroid99 | 2017-01-12 |
| | |\ \ | | |/ / | |/| | | |||
| | | * | Merge github.com:grpc/grpc into fix_errors | Craig Tiller | 2017-01-09 |
| | | |\ | | |_|/ | |/| | | |||
| | | * | Start fixing http error --> grpc status conversion | Craig Tiller | 2017-01-06 |
| | | | | |||
| * | | | Handshaker plugin mechanism. | Mark D. Roth | 2017-01-06 |
| | | | | |||
* | | | | Merge branch 'flow_control_v2' into bwest | Craig Tiller | 2016-12-27 |
|\| | | | |||
| | | * | Make Node extension work with slice changes | murgatroid99 | 2016-12-12 |
| | | | | |||
| | | * | Merge branch 'slice_interning' into metadata_filter | Craig Tiller | 2016-12-06 |
| | | |\ | |||
| | | | * | Merge branch 'slice_with_exec_ctx' into slice_interning | Craig Tiller | 2016-12-06 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | * | | | Merge branch 'master' into node_electron_build | murgatroid99 | 2016-12-05 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| * | | | | Use the same server code for both secure and insecure servers. | Mark D. Roth | 2016-12-02 |
| | | | | | |||
| | | | * | Merge branch 'slice_with_exec_ctx' into slice_interning | Craig Tiller | 2016-11-30 |
| | | | |\ | |||
| * | | | | | Fixed build.yaml and ran generate_projects.sh. | Mark D. Roth | 2016-11-29 |
| | | | | | | |||
| * | | | | | Merge branch 'security_handshaker1' into security_handshaker2 | Mark D. Roth | 2016-11-29 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||
| | | | * | | Merge branch 'slice_with_exec_ctx' into eliminate_mdstr | Craig Tiller | 2016-11-18 |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| * | | | | | Rename security handshaker files. | Mark D. Roth | 2016-11-17 |
| | | | | | | |||
| * | | | | | Use the same connector code for both secure and insecure clients. | Mark D. Roth | 2016-11-17 |
| | | | | | | |||
| | | | * | | Merge branch 'slice_interning' into eliminate_mdstr | Craig Tiller | 2016-11-16 |
| | | | |\| | |||
| | | | | * | Merge branch 'slice_with_exec_ctx' into slice_interning | Craig Tiller | 2016-11-16 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | * | | | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-16 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #8680 from ctiller/no_more_legacy | Craig Tiller | 2016-11-15 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Remove legacy poller | ||
| * \ \ \ \ \ | Merge pull request #8335 from y-zeng/tos | Yuchen Zeng | 2016-11-11 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add grpc_socket_mutator | ||
| | | | | | * | | Progress towards mdstr elimination | Craig Tiller | 2016-11-10 |
| | | | | | |/ |