Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into hpack_table | Yang Gao | 2016-04-05 |
|\ | |||
| * | Merge pull request #6037 from dgquintas/sockaddr_resolver_lb_2 | Jan Tattermusch | 2016-04-05 |
| |\ | |||
* | | | Merge branch 'master' into hpack_table | Yang Gao | 2016-04-05 |
|\| | | |||
| * | | Merge pull request #5726 from ctiller/ignore_connectivity | Jan Tattermusch | 2016-04-05 |
| |\ \ | |||
| | * \ | Merge branch 'ignore_connectivity' of github.com:ctiller/grpc into ignore_con... | Craig Tiller | 2016-04-04 |
| | |\ \ | |||
| | * | | | Fix | Craig Tiller | 2016-04-04 |
| | | * | | Merge branch 'master' into ignore_connectivity | Craig Tiller | 2016-04-04 |
| | |/| | | |||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into sockaddr_resolver_lb_2 | David Garcia Quintas | 2016-04-04 |
| | | | |\ | | | | |/ | | | |/| | |||
* | | | | | Merge branch 'master' into hpack_table | Yang Gao | 2016-04-04 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||
| | * | | | Merge branch 'master' of github.com:grpc/grpc into subchannel_factory_create_... | David Garcia Quintas | 2016-04-01 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | * | | | Merge branch 'master' into subchannel_factory_create_lb_channel | David G. Quintas | 2016-04-01 |
| | |\ \ \ | |||
| | * | | | | added grpc_client_channel_type for the creation of client channels | David Garcia Quintas | 2016-04-01 |
| * | | | | | Fixed zookeeper... (?) | Craig Tiller | 2016-04-01 |
| * | | | | | Zookeeper fixes | Craig Tiller | 2016-04-01 |
| * | | | | | Merge branch 'optionalize_census' into optionalize_resolvers | Craig Tiller | 2016-04-01 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||
* | | | | | | Merge branch 'master' into hpack_table | Yang Gao | 2016-04-01 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||
| | | | * | | Merge branch 'master' of github.com:grpc/grpc into subchannel_factory_create_... | David Garcia Quintas | 2016-03-31 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | | | * | Refine model used to enter transient failure for pick_first | Craig Tiller | 2016-03-31 |
| | | * | | | clang-fmt | Craig Tiller | 2016-03-31 |
| | | | | * | Merge github.com:grpc/grpc into ignore_connectivity | Craig Tiller | 2016-03-31 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | * | | | | Merge branch 'optionalize_census' into optionalize_resolvers | Craig Tiller | 2016-03-31 |
| | |\| | | | |||
| | | * | | | Fix include guards | 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 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||
| | * | | | | 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 |
* | | | | | | | Merge remote-tracking branch 'upstream/master' into hpack_table | yang-g | 2016-03-30 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
* | | | | | | | Use base64 encoded length for decoder table size | yang-g | 2016-03-30 |
| |/ / / / / |/| | | | | | |||
| * | | | | | Fix merge error | 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 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
| * | | | | | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-30 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||
| | | | * | | Renamed subchannel_factory to client_channel_factory. | David Garcia Quintas | 2016-03-29 |
| |_|_|/ / |/| | | | | |||
| | | * | | Merge branch 'optionalize_roundrobin' into optionalize_census | Craig Tiller | 2016-03-29 |
| | | |\ \ | | | |/ / | | |/| | | |||
| | * | | | clang-format | Craig Tiller | 2016-03-29 |
| | * | | | Merge github.com:grpc/grpc into optionalize_roundrobin | Craig Tiller | 2016-03-29 |
| | |\ \ \ | |_|/ / / |/| | | | | |||
| | | * | | Build Census as a grpc plugin | Craig Tiller | 2016-03-29 |
| | |/ / | |||
| | * | | Register plugins correctly | Craig Tiller | 2016-03-29 |
| | * | | Make plugin registries work | Craig Tiller | 2016-03-29 |
| * | | | 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 |
|/ / | |||
| * | Fix include guards | Craig Tiller | 2016-03-28 |
| * | Begin optionalizing lb policies: initial code movement | Craig Tiller | 2016-03-28 |
|/ | |||
* | Merge github.com:grpc/grpc into optionalize_chttp2 | Craig Tiller | 2016-03-28 |
* | Fix include guards | Craig Tiller | 2016-03-28 |
* | clang-format | Craig Tiller | 2016-03-28 |