diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-02-23 17:13:40 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-23 17:13:40 -0800 |
| commit | b9d91eb454ae7f72926e3c9f1dc6f723d23d51e2 (patch) | |
| tree | 333eed8b5e106faffe927bc437b831622ed5da2e /test/cpp/util | |
| parent | e4fe844b67191b46ee5d1942714e43cb2e12672b (diff) | |
| parent | 0b9dfcf02a09d480af681e9c3c1b1f85f5f2978d (diff) | |
Merge github.com:google/grpc into deprecate-c++
Conflicts:
test/cpp/end2end/async_end2end_test.cc
test/cpp/end2end/end2end_test.cc
Diffstat (limited to 'test/cpp/util')
| -rw-r--r-- | test/cpp/util/create_test_channel.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/util/create_test_channel.cc b/test/cpp/util/create_test_channel.cc index cf93589af5..be6c567060 100644 --- a/test/cpp/util/create_test_channel.cc +++ b/test/cpp/util/create_test_channel.cc @@ -75,7 +75,7 @@ std::shared_ptr<ChannelInterface> CreateTestChannel( server.empty() ? override_hostname : server; if (creds.get()) { channel_creds = - CredentialsFactory::ComposeCredentials(creds, channel_creds); + CredentialsFactory::CompositeCredentials(creds, channel_creds); } return CreateChannel(connect_to, channel_creds, channel_args); } else { |