diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-04 17:08:12 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-04 17:08:12 -0700 |
| commit | 5de46568cec21615d8ce30b7d32d8d91effc5fef (patch) | |
| tree | 666b5ec38cd6ced699e361f9ba22aa500429d834 /test/cpp/grpclb | |
| parent | 895653bc020a1862be7393fde31e48eb90df0e64 (diff) | |
| parent | 500e361826cb52a6d8db6839dc209dcf3266df0f (diff) | |
Merge github.com:grpc/grpc into cpparena
Diffstat (limited to 'test/cpp/grpclb')
| -rw-r--r-- | test/cpp/grpclb/grpclb_api_test.cc | 2 | ||||
| -rw-r--r-- | test/cpp/grpclb/grpclb_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc index 82ccf436f8..d9df2bb673 100644 --- a/test/cpp/grpclb/grpclb_api_test.cc +++ b/test/cpp/grpclb/grpclb_api_test.cc @@ -34,7 +34,7 @@ #include <grpc++/impl/codegen/config.h> #include <gtest/gtest.h> -#include "src/core/ext/lb_policy/grpclb/load_balancer_api.h" +#include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/proto/grpc/lb/v1/load_balancer.pb.h" // C++ version diff --git a/test/cpp/grpclb/grpclb_test.cc b/test/cpp/grpclb/grpclb_test.cc index 65fa73c417..d46de4f632 100644 --- a/test/cpp/grpclb/grpclb_test.cc +++ b/test/cpp/grpclb/grpclb_test.cc @@ -51,7 +51,7 @@ #include <grpc++/impl/codegen/config.h> extern "C" { -#include "src/core/ext/client_channel/client_channel.h" +#include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/iomgr/sockaddr.h" |