diff options
| author |  ahedberg <ahedberg@google.com> | 2016-03-28 17:28:19 -0400 |
|---|---|---|
| committer | ahedberg <ahedberg@google.com> | 2016-03-28 17:28:19 -0400 |
| commit | e72454cfa99e547fe0fbc411adb9c51962f11a28 (patch) | |
| tree | 883815a6b05dadac0f14ea2b3594cf711f15cc08 /src/cpp/common/secure_channel_arguments.cc | |
| parent | c86de00900f905bfde77184281f02cd190f1aa1a (diff) | |
| parent | e5cc05b5c6cee7026a0d28d39925621451506820 (diff) | |
merge to take src/core componentization into account
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 { |