Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-09 |
|\ | |||
| * | Merge pull request #8687 from dgquintas/handshaker_demote_logging | David G. Quintas | 2016-11-08 |
| |\ | |||
| | * | Demote handshake failure logging message from ERROR to INFO | David Garcia Quintas | 2016-11-08 |
| * | | Merge pull request #8518 from sreecha/mutrace_fix | Sree Kuchibhotla | 2016-11-08 |
| |\ \ | | |/ | |/| | |||
* | | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-08 |
|\| | | |||
| * | | Merge pull request #8618 from markdroth/channel_info_api | Mark D. Roth | 2016-11-08 |
| |\ \ | |||
| * \ \ | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| |\ \ \ | |||
| | * \ \ | Merge github.com:grpc/grpc into fuzzit | Craig Tiller | 2016-11-08 |
| | |\ \ \ | |||
| * | \ \ \ | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||
| | * | | | | Merge pull request #8080 from ctiller/decouple_version_number | Craig Tiller | 2016-11-08 |
| | |\ \ \ \ | |||
| * | | | | | | Remove errant header | Craig Tiller | 2016-11-08 |
| * | | | | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| |\| | | | | | |||
| | * | | | | | Merge pull request #8522 from lizan/write_compressed_byte_buffer | David G. Quintas | 2016-11-07 |
| | |\ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge pull request #8641 from ctiller/more-wtfs | Craig Tiller | 2016-11-07 |
| | |\ \ \ \ \ \ | |||
| | | | | | | * | | Fix build problem. | Mark D. Roth | 2016-11-07 |
| | | | | | | * | | Merge remote-tracking branch 'upstream/master' into channel_info_api | Mark D. Roth | 2016-11-07 |
| | | | | | | |\ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||
* | | | | | | | | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-07 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| | | | | * | | | | Merge github.com:grpc/grpc into decouple_version_number | Craig Tiller | 2016-11-04 |
| | | | | |\ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||
| * | | | | | | | | Merge pull request #8456 from ctiller/pid_ctl | Craig Tiller | 2016-11-04 |
| |\ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | clang-format code | Craig Tiller | 2016-11-04 |
| | | | * | | | | | | Fix windows for new RU api | Craig Tiller | 2016-11-04 |
| | | | * | | | | | | Make resource_quota a real object | Craig Tiller | 2016-11-04 |
| | * | | | | | | | | Fix spelling | Craig Tiller | 2016-11-04 |
| | | | | | | * | | | Merge github.com:grpc/grpc into fuzzit | Craig Tiller | 2016-11-04 |
| | | | | | | |\ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||
| | | | | | | | * | | clang-format | Mark D. Roth | 2016-11-04 |
| | | | | | | | * | | Merge remote-tracking branch 'upstream/master' into channel_info_api | Mark D. Roth | 2016-11-04 |
| | | | | | | | |\ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge pull request #8631 from soltanmm-google/blebs-on-cells-and-other-signs | Masood Malekghassemi | 2016-11-04 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Code review changes. | Mark D. Roth | 2016-11-04 |
* | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-04 |
|\| | | | | | | | | | |||
| | | | | | | | * | | Code review changes. | Mark D. Roth | 2016-11-04 |
| | | | * | | | | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-04 |
| | | | |\ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||
| | | | | | | * | | | Remove errant init | Craig Tiller | 2016-11-04 |
| | * | | | | | | | | Say what we mean | Masood Malekghassemi | 2016-11-03 |
| * | | | | | | | | | Merge pull request #8270 from daniel-j-born/server_port_index | Yuchen Zeng | 2016-11-03 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Fix build problem. | Mark D. Roth | 2016-11-03 |
* | | | | | | | | | | Change value of channel arg to string form, and reparse in each place we use it. | Mark D. Roth | 2016-11-03 |
* | | | | | | | | | | Rename method_config.[ch] to service_config.[ch]. | Mark D. Roth | 2016-11-03 |
* | | | | | | | | | | Add method to extract LB policy name from service config JSON. | Mark D. Roth | 2016-11-03 |
| | | | | | | | * | | Merge remote-tracking branch 'upstream/master' into channel_info_api | Mark D. Roth | 2016-11-03 |
| | | | | | | | |\ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'remove_fake_resolver' into service_config_json | Mark D. Roth | 2016-11-03 |
|\| | | | | | | | | | |||
* | | | | | | | | | | clang-format | Mark D. Roth | 2016-11-03 |
* | | | | | | | | | | Remove more now-unnecessary code. | Mark D. Roth | 2016-11-03 |
* | | | | | | | | | | Minor cleanups. | Mark D. Roth | 2016-11-03 |
* | | | | | | | | | | Remove now-unnecessary code. | Mark D. Roth | 2016-11-03 |
* | | | | | | | | | | Add grpc_json_tree to handle refcounting for channel arg. | Mark D. Roth | 2016-11-03 |
* | | | | | | | | | | Merge branch 'remove_fake_resolver' into service_config_json | Mark D. Roth | 2016-11-02 |
|\ \ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | Use JSON for service config channel arg. | Mark D. Roth | 2016-11-02 |
| | * | | | | | | | | | Merge pull request #8588 from murgatroid99/uv_resource_quota | Michael Lumish | 2016-11-02 |
| |/| | | | | | | | | | |||
| | * | | | | | | | | | Fixed weird whitespace change | murgatroid99 | 2016-11-01 |
| * | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_leaks_fix | David Garcia Quintas | 2016-11-01 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | |