aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAge
* Merge github.com:grpc/grpc into optionalize_censusGravatar Craig Tiller2016-03-31
|\
| * Merge github.com:grpc/grpc into copyright-fixGravatar Craig Tiller2016-03-31
| |\
* | \ Merge github.com:grpc/grpc into optionalize_censusGravatar Craig Tiller2016-03-31
|\ \ \ | | |/ | |/|
| * | Merge pull request #5943 from vjpai/make_unix_sockets_great_againGravatar Nicolas Noble2016-03-31
| |\ \
| * \ \ Merge pull request #6000 from ctiller/optionalize_roundrobinGravatar Nicolas Noble2016-03-31
| |\ \ \
| | | | * Merge github.com:grpc/grpc into copyright-fixGravatar Craig Tiller2016-03-31
| | | | |\ | | |_|_|/ | |/| | |
| | | | * Update copyrightsGravatar Craig Tiller2016-03-31
| * | | | Merge pull request #5691 from ctiller/idempotentGravatar Nicolas Noble2016-03-30
| |\ \ \ \
| * \ \ \ \ Merge pull request #5699 from ctiller/accountingGravatar Bogdan Drutu2016-03-30
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #5894 from soltanmm/stop-thatGravatar Jan Tattermusch2016-03-30
| |\ \ \ \ \ \
| | | * | | | | Fix merge errorGravatar Craig Tiller2016-03-30
| | | * | | | | Merge github.com:grpc/grpc into accountingGravatar Craig Tiller2016-03-30
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'optionalize_roundrobin' into optionalize_censusGravatar Craig Tiller2016-03-30
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge github.com:grpc/grpc into optionalize_roundrobinGravatar Craig Tiller2016-03-30
| |\| | | | | |
| | * | | | | | Revert "added grpclb support to sockaddr resolver"Gravatar Craig Tiller2016-03-30
| | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge pull request #6014 from nicolasnoble/manual-upmergeGravatar Jan Tattermusch2016-03-30
| | |\ \ \ \ \
| | | | | * \ \ Merge github.com:grpc/grpc into accountingGravatar Craig Tiller2016-03-30
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge pull request #5933 from dgquintas/sockaddr_resolver_lbGravatar Jan Tattermusch2016-03-30
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #5950 from dgquintas/lb_policies_new_interfaceGravatar Jan Tattermusch2016-03-30
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge pull request #5978 from dgquintas/channel_args_docsGravatar Jan Tattermusch2016-03-30
| | |\ \ \ \ \ \ \ \
| | | | | | * | | | | Merge branch 'release-0_13' into manual-upmergeGravatar Nicolas "Pixel" Noble2016-03-30
| | | |_|_|/| | | | | | | |/| | | | | | | |
| | | | | | * | | | | Better memory management for grpc_rb_byte_buffer_to_s.Gravatar Nicolas "Pixel" Noble2016-03-30
| | | | | | * | | | | Fix Ruby memory leaksGravatar Zhuochun2016-03-30
* | | | | | | | | | | Merge branch 'optionalize_roundrobin' into optionalize_censusGravatar Craig Tiller2016-03-29
|\| | | | | | | | | |
| * | | | | | | | | | clang-formatGravatar Craig Tiller2016-03-29
| * | | | | | | | | | Swap header/src into the right orderGravatar Craig Tiller2016-03-29
| * | | | | | | | | | Merge github.com:grpc/grpc into optionalize_roundrobinGravatar Craig Tiller2016-03-29
| |\| | | | | | | | |
| * | | | | | | | | | Merge github.com:grpc/grpc into optionalize_roundrobinGravatar Craig Tiller2016-03-29
| |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge github.com:grpc/grpc into fuzzy-bitsGravatar Craig Tiller2016-03-29
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch 'optionalize_roundrobin' into optionalize_censusGravatar Craig Tiller2016-03-29
|\| | | | | | | | | | |
| * | | | | | | | | | | Move proto code under ext/.../grpclbGravatar Craig Tiller2016-03-29
* | | | | | | | | | | | Build Census as a grpc pluginGravatar Craig Tiller2016-03-29
|/ / / / / / / / / / /
| * | | | | | | | | | Merge pull request #5736 from pquerna/pq/is_wan_is_ios_onlyGravatar Jan Tattermusch2016-03-29
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | Register plugins correctlyGravatar Craig Tiller2016-03-29
* | | | | | | | | | | | Make plugin registries workGravatar Craig Tiller2016-03-29
| * | | | | | | | | | | Merge pull request #5904 from jtattermusch/csharp_perf_intergrateGravatar Jan Tattermusch2016-03-29
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Starting plugin registryGravatar Craig Tiller2016-03-29
* | | | | | | | | | | | | Refactor build to have lb policies as extensionsGravatar Craig Tiller2016-03-29
| | | | | | | | | | | * | Merge github.com:grpc/grpc into idempotentGravatar Craig Tiller2016-03-28
| | | | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| | | | | | | | | | * | | Merge github.com:grpc/grpc into accountingGravatar Craig Tiller2016-03-28
| | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| | | | * | | | | | | | | Merge github.com:grpc/grpc into fuzzy-bitsGravatar Craig Tiller2016-03-28
| | | | |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge github.com:grpc/grpc into optionalize_roundrobinGravatar Craig Tiller2016-03-28
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #5900 from murgatroid99/node_callback_conventionGravatar Nicolas Noble2016-03-28
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #5945 from ahedberg/ip_pktinfo_optionalGravatar Nicolas Noble2016-03-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | Fix include guardsGravatar Craig Tiller2016-03-28
* | | | | | | | | | | | | | | Begin optionalizing lb policies: initial code movementGravatar Craig Tiller2016-03-28
|/ / / / / / / / / / / / / /
| | | | | | | | * | | | | | Merge branch 'master' of github.com:grpc/grpc into sockaddr_resolver_lbGravatar David Garcia Quintas2016-03-28
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | | PR comments.Gravatar David Garcia Quintas2016-03-28
| | | | | | | * | | | | | | | Merge branch 'master' of github.com:grpc/grpc into lb_policies_new_interfaceGravatar David Garcia Quintas2016-03-28
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / | | | | | | | | |/| | | | | |
| | | | | | * | / | | | | | | small improvements to channel_args docstringsGravatar David Garcia Quintas2016-03-28
| | | | | | | |/ / / / / / / | | | | | | |/| | | | | | |