diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-02-23 14:56:42 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-02-23 14:56:42 -0800 |
| commit | e8eb8a4fd46b56dfbfdc8666fa498186b824bed0 (patch) | |
| tree | 9d06a681bb64c2691f5b762f7f60654c544cb12c /test/cpp/util | |
| parent | 0d58570f01b5dc5e1eccea17de1c7a6c7c612662 (diff) | |
| parent | 74ae8f61d9cbc51d532b6ad98185094c1912a624 (diff) | |
Merge github.com:grpc/grpc into credit
Diffstat (limited to 'test/cpp/util')
| -rw-r--r-- | test/cpp/util/create_test_channel.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/cpp/util/create_test_channel.cc b/test/cpp/util/create_test_channel.cc index 278172f6ff..306a660da2 100644 --- a/test/cpp/util/create_test_channel.cc +++ b/test/cpp/util/create_test_channel.cc @@ -72,7 +72,8 @@ std::shared_ptr<ChannelInterface> CreateTestChannel( const grpc::string& connect_to = server.empty() ? override_hostname : server; if (creds.get()) { - channel_creds = ComposeCredentials(creds, channel_creds); + channel_creds = + CompositeCredentials(creds, channel_creds); } return CreateChannel(connect_to, channel_creds, channel_args); } else { |