| commit | e78bd13764a89350bd2869eabfadae00dd9c3b61 | [log] [tgz] |
|---|---|---|
| author | Mark D. Roth <roth@google.com> | Tue Dec 05 14:03:48 2017 -0800 |
| committer | GitHub <noreply@github.com> | Tue Dec 05 14:03:48 2017 -0800 |
| tree | 3c49145db0268c07349a42bafc7352c80c12305c | |
| parent | 5cf4b44fff8755edc9bdc46284d6cd270bc4a162 [diff] | |
| parent | 37575810523b10fb82fe7093629d2efc53044a18 [diff] |
Merge pull request #13642 from markdroth/server_connection_timeout_1.7 Apply #13336 to v1.7.x branch.