Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #6042 from ctiller/optionalize_resolvers | 2016-04-01 | |
|\ | |||
* \ | Merge pull request #5419 from ctiller/cleaner-posix2 | 2016-04-01 | |
|\ \ | |||
| | * | Fixed zookeeper... (?) | 2016-04-01 | |
| | * | Zookeeper fixes | 2016-04-01 | |
| | * | Merge github.com:grpc/grpc into optionalize_resolvers | 2016-04-01 | |
| | |\ | |_|/ |/| | | |||
* | | | Merge pull request #6001 from ctiller/optionalize_census | 2016-04-01 | |
|\ \ \ | |||
| | * \ | Merge github.com:grpc/grpc into cleaner-posix2 | 2016-04-01 | |
| | |\ \ | |_|/ / |/| | | | |||
| | | * | Merge branch 'optionalize_census' into optionalize_resolvers | 2016-04-01 | |
| | | |\ | | |_|/ | |/| | | |||
* | | | | Merge pull request #6012 from nicolasnoble/memleak_detector | 2016-03-31 | |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #6034 from dgquintas/uri_query_parts | 2016-03-31 | |
|\ \ \ \ \ | |||
| | * | | | | Fixing another memory leak. | 2016-04-01 | |
| | | * | | | clang-fmt | 2016-03-31 | |
* | | | | | | Merge pull request #5955 from jtattermusch/clearer_onconnect_msg | 2016-03-31 | |
|\ \ \ \ \ \ | |||
| | | | | | * | Merge branch 'optionalize_census' into optionalize_resolvers | 2016-03-31 | |
| | | | | | |\ | | | | | |_|/ | | | | |/| | | |||
| | | | * | | | Fix include guards | 2016-03-31 | |
| | | | | * | | Merge github.com:grpc/grpc into cleaner-posix2 | 2016-03-31 | |
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | | | |||
| | | | | | * | Merge branch 'optionalize_census' into optionalize_resolvers | 2016-03-31 | |
| | | | | | |\ | | | | | |_|/ | | | | |/| | | |||
| | | | * | | | Merge github.com:grpc/grpc into optionalize_census | 2016-03-31 | |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | |||
| | | | | | * | Optionalize name resolvers | 2016-03-31 | |
| | | | | |/ | | | | |/| | |||
* | | | | | | Merge github.com:grpc/grpc into copyright-fix | 2016-03-31 | |
|\ \ \ \ \ \ | |||
| | | | | * \ | Merge github.com:grpc/grpc into optionalize_census | 2016-03-31 | |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
| | | | | | * | Fix windows pollset initialization | 2016-03-31 | |
| | | | | | * | Merge github.com:grpc/grpc into cleaner-posix2 | 2016-03-31 | |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| * | | | | | | Merge pull request #5943 from vjpai/make_unix_sockets_great_again | 2016-03-31 | |
| |\ \ \ \ \ \ | |||
| | | | * \ \ \ | Merge branch 'master' of github.com:grpc/grpc into uri_query_parts | 2016-03-31 | |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| | | | * | | | | Added grpc_uri_get_query_arg per comments. | 2016-03-31 | |
| * | | | | | | | Merge pull request #6000 from ctiller/optionalize_roundrobin | 2016-03-31 | |
| |\ \ \ \ \ \ \ | |||
* | | | | | | | | | Merge github.com:grpc/grpc into copyright-fix | 2016-03-31 | |
|\| | | | | | | | | |||
* | | | | | | | | | Update copyrights | 2016-03-31 | |
| | | | | * | | | | Added & and = to URI queries | 2016-03-30 | |
| | |_|_|/ / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #5691 from ctiller/idempotent | 2016-03-30 | |
| |\ \ \ \ \ \ \ | |||
| | | | | | | | * | Merge github.com:grpc/grpc into cleaner-posix2 | 2016-03-30 | |
| | | | | | | | |\ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
| | | | | | | | * | Merge branch 'cleaner-posix2' of github.com:ctiller/grpc into cleaner-posix2 | 2016-03-30 | |
| | | | | | | | |\ | |||
| | | | | | | | * | | Add compilation guards for posix only code | 2016-03-30 | |
| * | | | | | | | | | Fix merge error | 2016-03-30 | |
| | | | | | | | | * | Merge github.com:grpc/grpc into cleaner-posix2 | 2016-03-30 | |
| | | | | | | | |/| | |||
| * | | | | | | | | | Merge github.com:grpc/grpc into accounting | 2016-03-30 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||
| | | | | | | | * | | Merge branch 'optionalize_roundrobin' into optionalize_census | 2016-03-30 | |
| | | | | | | | |\ \ | | | | | |_|_|_|/ / | | | | |/| | | | | | |||
| | | | * | | | | | | Merge github.com:grpc/grpc into optionalize_roundrobin | 2016-03-30 | |
| | | | |\ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||
| | * | | | | | | | | Revert "added grpclb support to sockaddr resolver" | 2016-03-30 | |
| |/ / / / / / / / |/| | | | | | | | | |||
* | | | | | | | | | Merge pull request #6014 from nicolasnoble/manual-upmerge | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | * | Fix include guards | 2016-03-30 | |
| | * | | | | | | | | Merge github.com:grpc/grpc into accounting | 2016-03-30 | |
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #5933 from dgquintas/sockaddr_resolver_lb | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #5950 from dgquintas/lb_policies_new_interface | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5978 from dgquintas/channel_args_docs | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * | | | Fixing json memory leak. | 2016-03-30 | |
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||
| | | | * | | | | | | | | Merge branch 'release-0_13' into manual-upmerge | 2016-03-30 | |
| |_|_|/| | | | | | | | |/| | | | | | | | | | | | |||
| | | | | | | | | * | | | better message for on_connect error | 2016-03-29 | |
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||
| | | | | | | | | * | | Merge branch 'optionalize_roundrobin' into optionalize_census | 2016-03-29 | |
| | | | | | | | | |\ \ | | | | | | | | |_|/ / | | | | | | | |/| | | |