diff options
| author |  Mark D. Roth <roth@google.com> | 2016-11-29 11:34:20 -0800 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-11-29 11:34:20 -0800 |
| commit | 09ee8d0284a04de2ca981dbf5435f4fa798ad136 (patch) | |
| tree | 9a017e6358eb3423d6f7fe0c4800112186d8559a /src/cpp/common/channel_arguments.cc | |
| parent | d4d4ce5faca698551ec4bb2c52adc69433fe53c6 (diff) | |
| parent | 3b04e7e3795f9f5e339ae7dfc40babb19485cfaf (diff) | |
Merge remote-tracking branch 'upstream/master' into security_handshaker1
Diffstat (limited to 'src/cpp/common/channel_arguments.cc')
| -rw-r--r-- | src/cpp/common/channel_arguments.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cpp/common/channel_arguments.cc b/src/cpp/common/channel_arguments.cc index 0067d6c5e1..0301b5b8ec 100644 --- a/src/cpp/common/channel_arguments.cc +++ b/src/cpp/common/channel_arguments.cc @@ -143,6 +143,11 @@ void ChannelArguments::SetLoadBalancingPolicyName( SetString(GRPC_ARG_LB_POLICY_NAME, lb_policy_name); } +void ChannelArguments::SetServiceConfigJSON( + const grpc::string& service_config_json) { + SetString(GRPC_ARG_SERVICE_CONFIG, service_config_json); +} + void ChannelArguments::SetInt(const grpc::string& key, int value) { grpc_arg arg; arg.type = GRPC_ARG_INTEGER; |