Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into cares_buildin | Yuchen Zeng | 2017-01-18 |
|\ | |||
| * | Fix binding.gyp syntax | murgatroid99 | 2017-01-13 |
| * | Fix electron artifact builds | murgatroid99 | 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 |
| |\ | |||
| | * | Handshaker plugin mechanism. | Mark D. Roth | 2017-01-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 remote-tracking branch 'upstream/master' into cares_buildin | Yuchen Zeng | 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 |
| | | |\ | | |_|/ | |/| | | |||
| | | * | 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 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 |
| | |\ \ | |||
| | * \ \ | Merge pull request #8335 from y-zeng/tos | Yuchen Zeng | 2016-11-11 |
| | |\ \ \ | |||
| * | | | | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-08 |
| |\| | | | | |||
* | | | | | | Merge remote-tracking branch 'upstream/master' into cares_buildin | Yuchen Zeng | 2016-11-08 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| | | | * | | Remove legacy poller | Craig Tiller | 2016-11-08 |
| * | | | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||
| | | * | | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-07 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||
| | | * | | | Rename method_config.[ch] to service_config.[ch]. | Mark D. Roth | 2016-11-03 |
* | | | | | | Fix windows build | Yuchen Zeng | 2016-11-02 |
| | | | * | | Merge remote-tracking branch 'upstream/master' into tos | Yuchen Zeng | 2016-11-02 |
| | | | |\ \ | | | | |/ / | | | |/| | | |||
| | | | | * | Refactor uv/non-uv code in Node extension | murgatroid99 | 2016-11-01 |
| | | | | * | Merge branch 'master' into node_electron_build | murgatroid99 | 2016-11-01 |
| | | | | |\ | | | | |_|/ | | | |/| | | |||
* | | | | | | Merge remote-tracking branch 'upstream/master' into cares_buildin | Yuchen Zeng | 2016-10-28 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| | | * | | | Merge github.com:grpc/grpc into pid_ctl | Craig Tiller | 2016-10-28 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | | | | * | libuv changes don't work with Electron | murgatroid99 | 2016-10-27 |
| | * | | | | Merge branch 'buffer_pools_for_realsies' into grpc_slice | Craig Tiller | 2016-10-26 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge github.com:grpc/grpc into buffer_pools_for_realsies | Craig Tiller | 2016-10-26 |
| |\ \ \ \ \ | |||
| | | * | | | | Generate build files | Craig Tiller | 2016-10-26 |
| | |/ / / / | |/| | | | | |||
| | * | | | | Merge remote-tracking branch 'upstream/master' into circular_dependency_fix | Mark D. Roth | 2016-10-26 |
| | |\ \ \ \ | |||
| | * | | | | | Move method_config module from ext/client_channel to lib/transport. | Mark D. Roth | 2016-10-26 |
| | | | | | * | Merge branch 'master' into node_electron_build | murgatroid99 | 2016-10-26 |
| | | | | | |\ | | | |_|_|_|/ | | |/| | | | | |||
| | | * | | | | Merge remote-tracking branch 'upstream/master' into resolver_channel_args | Mark D. Roth | 2016-10-26 |
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | | | | | * | Add electron support and build electron artifacts | murgatroid99 | 2016-10-25 |
* | | | | | | | Merge remote-tracking branch 'upstream/master' into cares_buildin | Yuchen Zeng | 2016-10-25 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||
| | * | | | | | Merge github.com:grpc/grpc into buffer_pools_for_realsies | Craig Tiller | 2016-10-24 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | | * | | | | Merge branch 'master' into uv_core_transport | murgatroid99 | 2016-10-21 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | | | * | | | Merge remote-tracking branch 'upstream/master' into resolver_channel_args | Mark D. Roth | 2016-10-21 |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | |||
| | | | * | | | Remove resolver_result. | Mark D. Roth | 2016-10-21 |
| | | | | * | | Add pid controller test | Craig Tiller | 2016-10-20 |
| | | | |/ / | |||
| | | * | | | Merge branch 'master' into uv_core_transport | murgatroid99 | 2016-10-19 |
| | | |\| | | |||
| * | | | | | Merge remote-tracking branch 'upstream/master' into rename_client_config | Mark D. Roth | 2016-10-19 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||
| | | * | | | Merge github.com:grpc/grpc into buffer_pools_for_realsies | Craig Tiller | 2016-10-19 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||
| | | | * | | Merge branch 'master' into uv_core_transport | murgatroid99 | 2016-10-19 |
| | | | |\ \ | |||
| | * | | \ \ | Merge remote-tracking branch 'upstream/master' into service_config | Mark D. Roth | 2016-10-18 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||
| | | | * | | | BufferPool --> ResourceQuota | Craig Tiller | 2016-10-17 |
* | | | | | | | Merge remote-tracking branch 'upstream/master' into cares_buildin | Yuchen Zeng | 2016-10-17 |
|\ \ \ \ \ \ \ |