Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Resolved merge conflicts with master | murgatroid99 | 2016-06-20 |
|\ | |||
| * | Merge pull request #6352 from ctiller/error | Jan Tattermusch | 2016-06-17 |
| |\ | |||
| * \ | Merge pull request #6863 from vjpai/wheezy | Jan Tattermusch | 2016-06-17 |
| |\ \ | |||
| | | * | clang-format code | Craig Tiller | 2016-06-17 |
| | | * | Cleanup spam | Craig Tiller | 2016-06-17 |
* | | | | Add comment about new trace flags | murgatroid99 | 2016-06-16 |
* | | | | More formatting fixes | murgatroid99 | 2016-06-16 |
* | | | | Clang format | murgatroid99 | 2016-06-16 |
| | * | | Merge branch 'master' into wheezy | Vijay Pai | 2016-06-15 |
| | |\ \ | |||
* | | | | | Allow disabling traces, add trace variables for pluck and timeout events | murgatroid99 | 2016-06-15 |
| |_|/ / |/| | | | |||
| | | * | Fix merge errors | Craig Tiller | 2016-06-15 |
| | | * | Fix merge error | Craig Tiller | 2016-06-15 |
| | | * | Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout | Craig Tiller | 2016-06-15 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Make {endpoint,fd}_shutdown idempotent | Craig Tiller | 2016-06-15 |
|/ / / | |||
| | * | Try to get some more debug info | Craig Tiller | 2016-06-14 |
| | * | Fix use-after-free | Craig Tiller | 2016-06-14 |
| | * | Handshake timeout implemented, and compiles | Craig Tiller | 2016-06-14 |
* | | | Rename gpr_strpad as gpr_leftpad | Yuchen Zeng | 2016-06-13 |
| | * | Getting handshake timeouts in place | Craig Tiller | 2016-06-13 |
| * | | Set back to the default log function after using an override | Vijay Pai | 2016-06-13 |
| | * | small fixes | Craig Tiller | 2016-06-13 |
* | | | Merge remote-tracking branch 'upstream/master' into log_format_check | Yuchen Zeng | 2016-06-10 |
|\ \ \ | |||
* | | | | Restricted the check to GUNC | Yuchen Zeng | 2016-06-10 |
* | | | | Add format check for gpr_log and gpr_asprintf | Yuchen Zeng | 2016-06-10 |
| | | * | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-09 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #6804 from ctiller/plugin_advertisement | Jan Tattermusch | 2016-06-09 |
|/| | | | |||
| | | * | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-09 |
| | | |\ | |_|_|/ |/| | | | |||
| | | * | Fix ipv4-only listening | Craig Tiller | 2016-06-09 |
| | | * | Merge branch 'error' of github.com:ctiller/grpc into error | Craig Tiller | 2016-06-09 |
| | | |\ | |||
| | | * | | Fix somewhat obvious error | Craig Tiller | 2016-06-09 |
| | | | * | Fix compile error on gcc | Craig Tiller | 2016-06-09 |
| | | |/ | |||
| | | * | Add error propagation | Craig Tiller | 2016-06-09 |
| | | * | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-09 |
| | | |\ | |_|_|/ |/| | | | |||
* | | | | Merge pull request #6481 from dgquintas/compression_md_level_bis | Jan Tattermusch | 2016-06-08 |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #6833 from rjshade/sockopts | Jan Tattermusch | 2016-06-08 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||
* | | | | | Merge pull request #6675 from dgquintas/check_http_client_filter_content_type | Jan Tattermusch | 2016-06-08 |
|\ \ \ \ \ | |||
* \ \ \ \ \ | Merge pull request #6786 from ctiller/meta-whoops | Jan Tattermusch | 2016-06-08 |
|\ \ \ \ \ \ | |||
| | | * | | | | Adds functions to set snd/rcv socket buffer sizes. | Robbie Shade | 2016-06-08 |
| |_|/ / / / |/| | | | | | |||
| | | * | | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis | David Garcia Quintas | 2016-06-07 |
| | | |\ \ \ | |||
* | | | | | | | Fix sed induced typo | David G. Quintas | 2016-06-07 |
| |_|_|/ / / |/| | | | | | |||
| | | * | | | s/maybe_compression_level.compression_level/maybe_compression_level.level | David Garcia Quintas | 2016-06-07 |
| | | | | * | Fix windows #define | Craig Tiller | 2016-06-07 |
| | | | | * | Fix windows include | Craig Tiller | 2016-06-07 |
| | | | | * | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-07 |
| | | | | |\ | |_|_|_|_|/ |/| | | | | | |||
* | | | | | | clang-format | David Garcia Quintas | 2016-06-06 |
* | | | | | | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-06-06 |
|\ \ \ \ \ \ | |||
* | | | | | | | moar renamings | David Garcia Quintas | 2016-06-06 |
| | | | | | * | Change constness | Craig Tiller | 2016-06-06 |
| | | | | * | | Advertise transport selected in user-agent string | Craig Tiller | 2016-06-06 |
| | | | | | * | Fix platform ifdef | Craig Tiller | 2016-06-06 |