Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into split-me-baby-one-more-time | Craig Tiller | 2016-03-31 |
|\ | |||
| * | 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 split-me-baby-one-more-time | Craig Tiller | 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 |
| |\ \ \ \ | |||
* | | | | | | Merge github.com:grpc/grpc into split-me-baby-one-more-time | Craig Tiller | 2016-03-30 |
|\| | | | | | |||
| * | | | | | Merge pull request #5699 from ctiller/accounting | Bogdan Drutu | 2016-03-30 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #5894 from soltanmm/stop-that | Jan Tattermusch | 2016-03-30 |
| |\ \ \ \ \ \ | |||
* | \ \ \ \ \ \ | Merge branch 'accounting' into split-me-baby-one-more-time | Craig Tiller | 2016-03-30 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| * | | | | | | | Fix merge error | Craig Tiller | 2016-03-30 |
* | | | | | | | | Merge branch 'accounting' into split-me-baby-one-more-time | 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 branch 'accounting' into split-me-baby-one-more-time | 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 |
| | | |_|_|/| | | | | | | |/| | | | | | | | | |||
| | | | | | * | | | | | Better memory management for grpc_rb_byte_buffer_to_s. | Nicolas "Pixel" Noble | 2016-03-30 |
| | | | | | * | | | | | Fix Ruby memory leaks | Zhuochun | 2016-03-30 |
| | | | | | | | | * | | clang-format | Craig Tiller | 2016-03-29 |
| | | | | | | | | * | | Swap header/src into the right order | Craig Tiller | 2016-03-29 |
| | | | | | | | | * | | Merge github.com:grpc/grpc into optionalize_roundrobin | Craig Tiller | 2016-03-29 |
| | | | | | | | | |\ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||
| | | | | | | | | * | | Merge github.com:grpc/grpc into optionalize_roundrobin | Craig Tiller | 2016-03-29 |
| | | | | | | | | |\ \ | |||
| | * | | | | | | | \ \ | Merge github.com:grpc/grpc into fuzzy-bits | Craig Tiller | 2016-03-29 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |||
| | | | | | | | | | * | | Move proto code under ext/.../grpclb | Craig Tiller | 2016-03-29 |
| | | * | | | | | | | | | Merge pull request #5736 from pquerna/pq/is_wan_is_ios_only | Jan Tattermusch | 2016-03-29 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | * | | Register plugins correctly | Craig Tiller | 2016-03-29 |
| | | | | | | | | | | * | | Make plugin registries work | Craig Tiller | 2016-03-29 |
| | | * | | | | | | | | | | Merge pull request #5904 from jtattermusch/csharp_perf_intergrate | Jan Tattermusch | 2016-03-29 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | * | | Starting plugin registry | Craig Tiller | 2016-03-29 |
| | | | | | | | | | | | * | | Refactor build to have lb policies as extensions | Craig Tiller | 2016-03-29 |
| | | | | | | | | | | * | | | Merge github.com:grpc/grpc into idempotent | Craig Tiller | 2016-03-28 |
| | | | | | | | | | | |\ \ \ | | | | |_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge branch 'accounting' into split-me-baby-one-more-time | Craig Tiller | 2016-03-28 |
|\| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge github.com:grpc/grpc into split-me-baby-one-more-time | 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 #5900 from murgatroid99/node_callback_convention | Nicolas Noble | 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 |