diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-05-03 07:35:51 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-05-03 07:35:51 -0700 |
| commit | 0bc3b40b76d6527a497777fa72d2fa26053a963a (patch) | |
| tree | 1e572c74fdd798e98e1b833ac5b0da716a50ce6d /src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c | |
| parent | 67e229e5c124efa826ef15e8a7e16634786fabeb (diff) | |
| parent | 892e4be6da9149a5fa7d3a4616ba0fa334828729 (diff) | |
Merge github.com:grpc/grpc into hiertune
Diffstat (limited to 'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c')
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c index ff41e61b3e..4c17f9c082 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.c @@ -414,7 +414,8 @@ static void rr_exit_idle_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) { static int rr_pick_locked(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol, const grpc_lb_policy_pick_args *pick_args, - grpc_connected_subchannel **target, void **user_data, + grpc_connected_subchannel **target, + grpc_call_context_element *context, void **user_data, grpc_closure *on_complete) { round_robin_lb_policy *p = (round_robin_lb_policy *)pol; pending_pick *pp; |