diff options
author | Craig Tiller <ctiller@google.com> | 2015-09-22 09:25:57 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-09-22 09:25:57 -0700 |
commit | 10ee2747a92a20c0bbe8cf3e2e759a121c6cb076 (patch) | |
tree | d295d20b29d36c273216368e93b5fcdb65892f76 /src/core/surface/init.c | |
parent | d9fdaf204cbca6472f5588eba83f37c01bb6c8a4 (diff) | |
parent | 1ca05139a2d3b05518d73200b53ccb86161eeef3 (diff) |
Merge github.com:grpc/grpc into we-are-one
Diffstat (limited to 'src/core/surface/init.c')
-rw-r--r-- | src/core/surface/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/surface/init.c b/src/core/surface/init.c index 03bd026a42..93c27c77bf 100644 --- a/src/core/surface/init.c +++ b/src/core/surface/init.c @@ -42,6 +42,7 @@ #include "src/core/channel/channel_stack.h" #include "src/core/client_config/lb_policy_registry.h" #include "src/core/client_config/lb_policies/pick_first.h" +#include "src/core/client_config/lb_policies/round_robin.h" #include "src/core/client_config/resolver_registry.h" #include "src/core/client_config/resolvers/dns_resolver.h" #include "src/core/client_config/resolvers/sockaddr_resolver.h" @@ -89,6 +90,7 @@ void grpc_init(void) { gpr_time_init(); grpc_lb_policy_registry_init(grpc_pick_first_lb_factory_create()); grpc_register_lb_policy(grpc_pick_first_lb_factory_create()); + grpc_register_lb_policy(grpc_round_robin_lb_factory_create()); grpc_resolver_registry_init("dns:///"); grpc_register_resolver_type(grpc_dns_resolver_factory_create()); grpc_register_resolver_type(grpc_ipv4_resolver_factory_create()); |