aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
Commit message (Expand)AuthorAge
* Merge pull request #6042 from ctiller/optionalize_resolversGravatar Nicolas Noble2016-04-01
|\
* \ Merge pull request #5419 from ctiller/cleaner-posix2Gravatar Nicolas Noble2016-04-01
|\ \
| | * Fixed zookeeper... (?)Gravatar Craig Tiller2016-04-01
| | * Zookeeper fixesGravatar Craig Tiller2016-04-01
| | * Merge github.com:grpc/grpc into optionalize_resolversGravatar Craig Tiller2016-04-01
| | |\ | |_|/ |/| |
* | | Merge pull request #6001 from ctiller/optionalize_censusGravatar Jan Tattermusch2016-04-01
|\ \ \
| | * \ Merge github.com:grpc/grpc into cleaner-posix2Gravatar Craig Tiller2016-04-01
| | |\ \ | |_|/ / |/| | |
| | | * Merge branch 'optionalize_census' into optionalize_resolversGravatar Craig Tiller2016-04-01
| | | |\ | | |_|/ | |/| |
* | | | Merge pull request #6012 from nicolasnoble/memleak_detectorGravatar Nicolas Noble2016-03-31
|\ \ \ \
* \ \ \ \ Merge pull request #6034 from dgquintas/uri_query_partsGravatar Nicolas Noble2016-03-31
|\ \ \ \ \
| | * | | | Fixing another memory leak.Gravatar Nicolas "Pixel" Noble2016-04-01
| | | * | | clang-fmtGravatar Craig Tiller2016-03-31
* | | | | | Merge pull request #5955 from jtattermusch/clearer_onconnect_msgGravatar Nicolas Noble2016-03-31
|\ \ \ \ \ \
| | | | | | * Merge branch 'optionalize_census' into optionalize_resolversGravatar Craig Tiller2016-03-31
| | | | | | |\ | | | | | |_|/ | | | | |/| |
| | | | * | | Fix include guardsGravatar Craig Tiller2016-03-31
| | | | | * | Merge github.com:grpc/grpc into cleaner-posix2Gravatar Craig Tiller2016-03-31
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | |
| | | | | | * Merge branch 'optionalize_census' into optionalize_resolversGravatar Craig Tiller2016-03-31
| | | | | | |\ | | | | | |_|/ | | | | |/| |
| | | | * | | Merge github.com:grpc/grpc into optionalize_censusGravatar Craig Tiller2016-03-31
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
| | | | | | * Optionalize name resolversGravatar 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
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | |
| | | | | | * Fix windows pollset initializationGravatar Craig Tiller2016-03-31
| | | | | | * Merge github.com:grpc/grpc into cleaner-posix2Gravatar Craig Tiller2016-03-31
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #5943 from vjpai/make_unix_sockets_great_againGravatar Nicolas Noble2016-03-31
| |\ \ \ \ \ \
| | | | * \ \ \ Merge branch 'master' of github.com:grpc/grpc into uri_query_partsGravatar David Garcia Quintas2016-03-31
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | | | * | | | Added grpc_uri_get_query_arg per comments.Gravatar David Garcia Quintas2016-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
| | | | | * | | | Added & and = to URI queriesGravatar David Garcia Quintas2016-03-30
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #5691 from ctiller/idempotentGravatar Nicolas Noble2016-03-30
| |\ \ \ \ \ \ \
| | | | | | | | * Merge github.com:grpc/grpc into cleaner-posix2Gravatar Craig Tiller2016-03-30
| | | | | | | | |\ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | | | | | | | * Merge branch 'cleaner-posix2' of github.com:ctiller/grpc into cleaner-posix2Gravatar Craig Tiller2016-03-30
| | | | | | | | |\
| | | | | | | | * | Add compilation guards for posix only codeGravatar Craig Tiller2016-03-30
| * | | | | | | | | Fix merge errorGravatar Craig Tiller2016-03-30
| | | | | | | | | * Merge github.com:grpc/grpc into cleaner-posix2Gravatar 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
|\ \ \ \ \ \ \ \ \
| | | | | | | | | * Fix include guardsGravatar Craig Tiller2016-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
|\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | Fixing json memory leak.Gravatar Nicolas "Pixel" Noble2016-03-30
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| | | | * | | | | | | | Merge branch 'release-0_13' into manual-upmergeGravatar Nicolas "Pixel" Noble2016-03-30
| |_|_|/| | | | | | | | |/| | | | | | | | | | |
| | | | | | | | | * | | better message for on_connect errorGravatar Jan Tattermusch2016-03-29
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| | | | | | | | | * | Merge branch 'optionalize_roundrobin' into optionalize_censusGravatar Craig Tiller2016-03-29
| | | | | | | | | |\ \ | | | | | | | | |_|/ / | | | | | | | |/| | |