Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of https://github.com/grpc/grpc into gpr_malloc_is_all | Nicolas "Pixel" Noble | 2016-04-05 |
|\ | |||
| * | Merge pull request #6042 from ctiller/optionalize_resolvers | Nicolas Noble | 2016-04-01 |
| |\ | |||
| * \ | Merge pull request #5419 from ctiller/cleaner-posix2 | Nicolas Noble | 2016-04-01 |
| |\ \ | |||
| | | * | Fixed zookeeper... (?) | Craig Tiller | 2016-04-01 |
| | | * | Zookeeper fixes | Craig Tiller | 2016-04-01 |
| | | * | Merge github.com:grpc/grpc into optionalize_resolvers | Craig Tiller | 2016-04-01 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #6001 from ctiller/optionalize_census | Jan Tattermusch | 2016-04-01 |
| |\ \ \ | |||
| | | * \ | Merge github.com:grpc/grpc into cleaner-posix2 | Craig Tiller | 2016-04-01 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | | * | Merge branch 'optionalize_census' into optionalize_resolvers | Craig Tiller | 2016-04-01 |
| | | | |\ | | | |_|/ | | |/| | | |||
| * | | | | Merge pull request #6012 from nicolasnoble/memleak_detector | Nicolas Noble | 2016-03-31 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge pull request #6034 from dgquintas/uri_query_parts | Nicolas Noble | 2016-03-31 |
| |\ \ \ \ \ | |||
| | | * | | | | Fixing another memory leak. | Nicolas "Pixel" Noble | 2016-04-01 |
| | | | * | | | clang-fmt | Craig Tiller | 2016-03-31 |
| * | | | | | | Merge pull request #5955 from jtattermusch/clearer_onconnect_msg | Nicolas Noble | 2016-03-31 |
| |\ \ \ \ \ \ | |||
| | | | | | | * | Merge branch 'optionalize_census' into optionalize_resolvers | Craig Tiller | 2016-03-31 |
| | | | | | | |\ | | | | | | |_|/ | | | | | |/| | | |||
| | | | | * | | | Fix include guards | Craig Tiller | 2016-03-31 |
| | | | | | * | | Merge github.com:grpc/grpc into cleaner-posix2 | Craig Tiller | 2016-03-31 |
| | | | | | |\ \ | | |_|_|_|_|/ / | |/| | | | | | | |||
| | | | | | | * | Merge branch 'optionalize_census' into optionalize_resolvers | Craig Tiller | 2016-03-31 |
| | | | | | | |\ | | | | | | |_|/ | | | | | |/| | | |||
| | | | | * | | | Merge github.com:grpc/grpc into optionalize_census | Craig Tiller | 2016-03-31 |
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| | | | | | | * | Optionalize name resolvers | Craig Tiller | 2016-03-31 |
| | | | | | |/ | | | | | |/| | |||
| * | | | | | | Merge github.com:grpc/grpc into copyright-fix | Craig Tiller | 2016-03-31 |
| |\ \ \ \ \ \ | |||
| | | | | | * \ | Merge github.com:grpc/grpc into optionalize_census | Craig Tiller | 2016-03-31 |
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | | | |||
| | | | | | | * | Fix windows pollset initialization | Craig Tiller | 2016-03-31 |
| | | | | | | * | Merge github.com:grpc/grpc into cleaner-posix2 | Craig Tiller | 2016-03-31 |
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | | | |||
| | * | | | | | | Merge pull request #5943 from vjpai/make_unix_sockets_great_again | Nicolas Noble | 2016-03-31 |
| | |\ \ \ \ \ \ | |||
| | | | | * \ \ \ | Merge branch 'master' of github.com:grpc/grpc into uri_query_parts | David Garcia Quintas | 2016-03-31 |
| | | | | |\ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||
| | | | | * | | | | Added grpc_uri_get_query_arg per comments. | David Garcia Quintas | 2016-03-31 |
| | * | | | | | | | Merge pull request #6000 from ctiller/optionalize_roundrobin | Nicolas Noble | 2016-03-31 |
| | |\ \ \ \ \ \ \ | |||
| * | | | | | | | | | Merge github.com:grpc/grpc into copyright-fix | Craig Tiller | 2016-03-31 |
| |\| | | | | | | | | |||
| * | | | | | | | | | Update copyrights | Craig Tiller | 2016-03-31 |
| | | | | | * | | | | Added & and = to URI queries | David Garcia Quintas | 2016-03-30 |
| | | |_|_|/ / / / | | |/| | | | | | | |||
| | * | | | | | | | Merge pull request #5691 from ctiller/idempotent | Nicolas Noble | 2016-03-30 |
| | |\ \ \ \ \ \ \ | |||
| | | | | | | | | * | Merge github.com:grpc/grpc into cleaner-posix2 | Craig Tiller | 2016-03-30 |
| | | | | | | | | |\ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||
| | | | | | | | | * | Merge branch 'cleaner-posix2' of github.com:ctiller/grpc into cleaner-posix2 | Craig Tiller | 2016-03-30 |
| | | | | | | | | |\ | |||
| | | | | | | | | * | | Add compilation guards for posix only code | Craig Tiller | 2016-03-30 |
| | * | | | | | | | | | Fix merge error | Craig Tiller | 2016-03-30 |
| | | | | | | | | | * | Merge github.com:grpc/grpc into cleaner-posix2 | Craig Tiller | 2016-03-30 |
| | | | | | | | | |/| | |||
| | * | | | | | | | | | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-30 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||
| | | | | | | | | * | | Merge branch 'optionalize_roundrobin' into optionalize_census | 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 pull request #6014 from nicolasnoble/manual-upmerge | Jan Tattermusch | 2016-03-30 |
| |\ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * | Fix include guards | Craig Tiller | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | * | | | Fixing json memory leak. | Nicolas "Pixel" Noble | 2016-03-30 |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||
| | | | | * | | | | | | | | Merge branch 'release-0_13' into manual-upmerge | Nicolas "Pixel" Noble | 2016-03-30 |
| | |_|_|/| | | | | | | | | |/| | | | | | | | | | | | |||
| | | | | | | | | | * | | | better message for on_connect error | Jan Tattermusch | 2016-03-29 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |