diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-10-19 15:19:00 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-10-19 15:19:00 -0700 |
| commit | 10edf68eec9ec2d5520cb2cb88010090257ea946 (patch) | |
| tree | 86f985cea32f234371c6f4b868312e2186b4d569 /src/core/ext/lb_policy/round_robin | |
| parent | b7a83818f8dc3d8f01a62613471951446fff87c6 (diff) | |
| parent | 70ee74c4798afe781788d40afe1923feff37d657 (diff) | |
Merge branch 'master' into uv_core_transport
Diffstat (limited to 'src/core/ext/lb_policy/round_robin')
| -rw-r--r-- | src/core/ext/lb_policy/round_robin/round_robin.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/ext/lb_policy/round_robin/round_robin.c b/src/core/ext/lb_policy/round_robin/round_robin.c index 3a9250fd61..c26851653e 100644 --- a/src/core/ext/lb_policy/round_robin/round_robin.c +++ b/src/core/ext/lb_policy/round_robin/round_robin.c @@ -627,6 +627,7 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx, * the copying of args->server_name (a borrowed pointer) OK. */ sc_args.server_name = args->server_name; sc_args.addr = &args->addresses->addresses[i].address; + sc_args.args = args->additional_args; grpc_subchannel *subchannel = grpc_client_channel_factory_create_subchannel( exec_ctx, args->client_channel_factory, &sc_args); |