diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-08-31 15:59:13 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-08-31 15:59:13 -0700 |
| commit | 245bd8875b4640104df433f6a432b5d63799bfb8 (patch) | |
| tree | 5ddd592e172d9e7fec49300f54db6b0bdff7c275 /src/cpp/client/channel.cc | |
| parent | ae69ad1bcf0322200ebeed5476ee9978101beeb7 (diff) | |
| parent | cbdfaba7ae41634c66d1a32cbc2ea674a34be9c6 (diff) | |
Merge github.com:grpc/grpc into second-coming
Diffstat (limited to 'src/cpp/client/channel.cc')
| -rw-r--r-- | src/cpp/client/channel.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc index 8bf2e4687e..dc8e304664 100644 --- a/src/cpp/client/channel.cc +++ b/src/cpp/client/channel.cc @@ -40,7 +40,7 @@ #include <grpc/support/slice.h> #include <grpc++/client_context.h> #include <grpc++/completion_queue.h> -#include <grpc++/credentials.h> +#include <grpc++/security/credentials.h> #include <grpc++/impl/call.h> #include <grpc++/impl/rpc_method.h> #include <grpc++/support/channel_arguments.h> |