diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-03-30 09:32:00 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-03-30 09:32:00 -0700 |
| commit | c65221cf34c41cbbea8f12c0ef3c73f1127bd113 (patch) | |
| tree | 05f3260356b9ab9817c622f53654fefd5d0c325c /src/cpp/common/secure_channel_arguments.cc | |
| parent | 7ec0fa78b2eef5f0b4f32671cc78dccc4070fdb7 (diff) | |
| parent | e39707458df9c77a2a2570f9dbf3d18b01ca4d68 (diff) | |
Merge branch 'master' into binary_logging
Diffstat (limited to 'src/cpp/common/secure_channel_arguments.cc')
| -rw-r--r-- | src/cpp/common/secure_channel_arguments.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpp/common/secure_channel_arguments.cc b/src/cpp/common/secure_channel_arguments.cc index e17d3b58b0..82e02f0238 100644 --- a/src/cpp/common/secure_channel_arguments.cc +++ b/src/cpp/common/secure_channel_arguments.cc @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -34,7 +34,7 @@ #include <grpc++/support/channel_arguments.h> #include <grpc/grpc_security.h> -#include "src/core/channel/channel_args.h" +#include "src/core/lib/channel/channel_args.h" namespace grpc { |