Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Fix merge error | Craig Tiller | 2016-03-30 |
* | Merge github.com:grpc/grpc into accounting | 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 |
| | |_|_|/| | |/| | | | | |||
* | | | | | | 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 pull request #5945 from ahedberg/ip_pktinfo_optional | Nicolas Noble | 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 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
| | | | * | | | | | 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 |
| | * | | | | | | | Fix another path | Craig Tiller | 2016-03-25 |
| | * | | | | | | | Fix another path | Craig Tiller | 2016-03-25 |
| | | | | | * | | | Changes to resolver-lb interfaces. | David Garcia Quintas | 2016-03-25 |
| | * | | | | | | | Fix | Craig Tiller | 2016-03-25 |
| | * | | | | | | | Fix includes | Craig Tiller | 2016-03-25 |
| | * | | | | | | | Fix copyright | Craig Tiller | 2016-03-25 |
| | * | | | | | | | Fix include guards | Craig Tiller | 2016-03-25 |
| | * | | | | | | | Stage #1 of core breakup: move everything under lib | Craig Tiller | 2016-03-25 |
| |/ / / / / / / | |||
| * | | | | | | | Fixes | Craig Tiller | 2016-03-25 |
| * | | | | | | | Fix copyrights | Craig Tiller | 2016-03-25 |
| | | | | | | * | Merge pull request #5957 from jtattermusch/fix_ruby_gem_building | Jan Tattermusch | 2016-03-25 |
| | | | | | | |\ | |||
| * | | | | | | | | Auto-changes | Craig Tiller | 2016-03-25 |
| | | | | | | | * | make grpc_pollset_set_create for windows match the header | Jan Tattermusch | 2016-03-25 |
| * | | | | | | | | dont check read_info for writes | Jan Tattermusch | 2016-03-25 |
| | |_|_|/ / / / | |/| | | | | | | |||
| | | * | | | | | compare setsockopt result to 0 before returning | ahedberg | 2016-03-24 |
| | | * | | | | | re-add grpc_set_socket_ipv6... | ahedberg | 2016-03-24 |
| | | * | | | | | make IP_PKTINFO and IPV6_RECVPKTINFO optional | ahedberg | 2016-03-24 |
| | |/ / / / / | |/| | | | | | |||
| | | * | | | | Merge github.com:grpc/grpc into fuzzy-bits | Craig Tiller | 2016-03-24 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | |