From 4bbbfafcde2e8fc2518eb3379ff416ef4bdcb9d2 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 7 Jun 2017 13:02:15 -0700 Subject: Fix merge --- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/ext') diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c index a23a56c052..40e9848416 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c @@ -1021,7 +1021,7 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx, grpc_closure_init(&glb_policy->lb_channel_on_connectivity_changed, glb_lb_channel_on_connectivity_changed_cb, glb_policy, - grpc_combiner_scheduler(args->combiner, false)); + grpc_combiner_scheduler(args->combiner)); grpc_lb_policy_init(&glb_policy->base, &glb_lb_policy_vtable, args->combiner); grpc_connectivity_state_init(&glb_policy->state_tracker, GRPC_CHANNEL_IDLE, "grpclb"); -- cgit v1.2.3