Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into copyright-fix | Craig Tiller | 2016-03-31 |
|\ | |||
| * | Merge pull request #5943 from vjpai/make_unix_sockets_great_again | Nicolas Noble | 2016-03-31 |
| |\ | |||
| * \ | Merge pull request #6000 from ctiller/optionalize_roundrobin | Nicolas Noble | 2016-03-31 |
| |\ \ | |||
* | | | | Merge github.com:grpc/grpc into copyright-fix | Craig Tiller | 2016-03-31 |
|\| | | | |||
* | | | | Update copyrights | Craig Tiller | 2016-03-31 |
| * | | | Merge pull request #5691 from ctiller/idempotent | Nicolas Noble | 2016-03-30 |
| |\ \ \ | |||
| * | | | | Fix merge error | Craig Tiller | 2016-03-30 |
| * | | | | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-30 |
| |\ \ \ \ | |||
| | | | * \ | Merge github.com:grpc/grpc into optionalize_roundrobin | Craig Tiller | 2016-03-30 |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| | * | | | | Revert "added grpclb support to sockaddr resolver" | Craig Tiller | 2016-03-30 |
| |/ / / / |/| | | | | |||
* | | | | | Merge pull request #6014 from nicolasnoble/manual-upmerge | Jan Tattermusch | 2016-03-30 |
|\ \ \ \ \ | |||
| | * \ \ \ | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-30 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
* | | | | | | Merge pull request #5933 from dgquintas/sockaddr_resolver_lb | Jan Tattermusch | 2016-03-30 |
|\ \ \ \ \ \ | |||
* \ \ \ \ \ \ | Merge pull request #5950 from dgquintas/lb_policies_new_interface | Jan Tattermusch | 2016-03-30 |
|\ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ | Merge pull request #5978 from dgquintas/channel_args_docs | Jan Tattermusch | 2016-03-30 |
|\ \ \ \ \ \ \ \ | |||
| | | | * | | | | | Merge branch 'release-0_13' into manual-upmerge | Nicolas "Pixel" Noble | 2016-03-30 |
| |_|_|/| | | | | |/| | | | | | | | | |||
| | | | | | | * | | clang-format | Craig Tiller | 2016-03-29 |
| | | | | | | * | | Merge github.com:grpc/grpc into optionalize_roundrobin | Craig Tiller | 2016-03-29 |
| | | | | | | |\ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||
| | | | | | | * | | Register plugins correctly | Craig Tiller | 2016-03-29 |
| | | | | | | * | | Make plugin registries work | Craig Tiller | 2016-03-29 |
| | | | | | | * | | Starting plugin registry | Craig Tiller | 2016-03-29 |
| | | | | | * | | | Merge github.com:grpc/grpc into idempotent | Craig Tiller | 2016-03-28 |
| | | | | | |\ \ \ | |||
| | | | | * | \ \ \ | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-28 |
| | | | | |\ \ \ \ \ | | | | | | | |/ / / | | | | | | |/| | | | |||
* | | | | | | | | | | Merge github.com:grpc/grpc into fuzzy-bits | Craig Tiller | 2016-03-28 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||
| | | | | | | | * | | Merge github.com:grpc/grpc into optionalize_roundrobin | Craig Tiller | 2016-03-28 |
| | | | | | | | |\ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge pull request #5945 from ahedberg/ip_pktinfo_optional | Nicolas Noble | 2016-03-28 |
| |\ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | * | | Fix include guards | Craig Tiller | 2016-03-28 |
| | | | | | | | | * | | Begin optionalizing lb policies: initial code movement | Craig Tiller | 2016-03-28 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
| | | | | * | | | | | Merge branch 'master' of github.com:grpc/grpc into sockaddr_resolver_lb | David Garcia Quintas | 2016-03-28 |
| | | | | |\ \ \ \ \ | |||
| | | | | * | | | | | | PR comments. | David Garcia Quintas | 2016-03-28 |
| | | | * | | | | | | | Merge branch 'master' of github.com:grpc/grpc into lb_policies_new_interface | David Garcia Quintas | 2016-03-28 |
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | | | |||
| | | * | / | | | | | | small improvements to channel_args docstrings | David Garcia Quintas | 2016-03-28 |
| | | | |/ / / / / / | | | |/| | | | | | | |||
| * | | | | | | | | | Merge github.com:grpc/grpc into optionalize_chttp2 | Craig Tiller | 2016-03-28 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||
| | | * | | | | | | | merge to take src/core componentization into account | ahedberg | 2016-03-28 |
| | | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | | tell older compilers that not using fd is okay | ahedberg | 2016-03-28 |
| | | * | | | | | | | | fix copyright to include 2015 | ahedberg | 2016-03-28 |
| * | | | | | | | | | | Fix include guards | Craig Tiller | 2016-03-28 |
| | * | | | | | | | | | Merge github.com:grpc/grpc into status_codes | Craig Tiller | 2016-03-28 |
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | |||
* | | | | | | | | | | | Merge github.com:grpc/grpc into fuzzy-bits | Craig Tiller | 2016-03-28 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||
| | | | | | | | * | | | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-28 |
| | | | | | | | |\ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||
| | | | | | | | | * | | Merge github.com:grpc/grpc into idempotent | Craig Tiller | 2016-03-28 |
| | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||
| | | | | | | | | | * | Merge branch 'master' into make_unix_sockets_great_again | Vijay Pai | 2016-03-28 |
| | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||
| | | | * | | | | | | | fix copyright | ahedberg | 2016-03-28 |
| | * | | | | | | | | | clang-format | Craig Tiller | 2016-03-28 |
| | * | | | | | | | | | Move chttp2 related files under ext/ | Craig Tiller | 2016-03-28 |
| |/ / / / / / / / / | |||
| | | | | | | * | | | Sprinkle constants here and there | Craig Tiller | 2016-03-28 |
| | | | | | | * | | | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-28 |
| | | | | | | |\ \ \ | |||
| | * | | | | | \ \ \ | Merge github.com:grpc/grpc into status_codes | Craig Tiller | 2016-03-26 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | | | |||
* | | | | | | | | | | | Merge github.com:grpc/grpc into fuzzy-bits | Craig Tiller | 2016-03-26 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||
| | * | | | | | | | | | Regenerate files | Craig Tiller | 2016-03-26 |