diff options
| author |  David G. Quintas <dgq@google.com> | 2017-06-07 12:29:59 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-06-07 12:29:59 -0700 |
| commit | 3f02e8cb4ba8882ee710b6af766bc7c6b74594e4 (patch) | |
| tree | d462b1e433a4ef8e7bf06e48895f52f6094c0d30 /src/core/lib/channel/channel_args.h | |
| parent | b89a100d69f9d975ba58a6e152354ad9614b7f96 (diff) | |
| parent | 87d5a3130dc94898aed40e74e998a72d21156ae5 (diff) | |
Merge pull request #11159 from dgquintas/lb_update_server5
Implement LB policy updates
Diffstat (limited to 'src/core/lib/channel/channel_args.h')
| -rw-r--r-- | src/core/lib/channel/channel_args.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h index f0f603e251..128afd00d4 100644 --- a/src/core/lib/channel/channel_args.h +++ b/src/core/lib/channel/channel_args.h @@ -63,8 +63,8 @@ grpc_channel_args *grpc_channel_args_copy_and_add_and_remove( const grpc_channel_args *src, const char **to_remove, size_t num_to_remove, const grpc_arg *to_add, size_t num_to_add); -/** Concatenate args from \a a and \a b into a new instance */ -grpc_channel_args *grpc_channel_args_merge(const grpc_channel_args *a, +/** Perform the union of \a a and \a b, prioritizing \a a entries */ +grpc_channel_args *grpc_channel_args_union(const grpc_channel_args *a, const grpc_channel_args *b); /** Destroy arguments created by \a grpc_channel_args_copy */ |