diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-21 15:23:53 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-21 15:23:53 -0700 |
| commit | ae07f7fdc670e4226a4f80088023b06ce4c5a8a7 (patch) | |
| tree | c9f321ce305cc0c9f38e10df2b6172be12c0f9a0 /test/core/end2end/fake_resolver.c | |
| parent | af842451318f73d0fd2dcb55f02baaa70c82f3f9 (diff) | |
| parent | d9cbec465db305368b04d13409665bd711fa78cf (diff) | |
Merge remote-tracking branch 'upstream/master' into resolver_channel_args
Diffstat (limited to 'test/core/end2end/fake_resolver.c')
| -rw-r--r-- | test/core/end2end/fake_resolver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/core/end2end/fake_resolver.c b/test/core/end2end/fake_resolver.c index 8e0d8a45b3..0dcfdcf43b 100644 --- a/test/core/end2end/fake_resolver.c +++ b/test/core/end2end/fake_resolver.c @@ -42,10 +42,10 @@ #include <grpc/support/port_platform.h> #include <grpc/support/string_util.h> -#include "src/core/ext/client_config/lb_policy_factory.h" -#include "src/core/ext/client_config/method_config.h" -#include "src/core/ext/client_config/parse_address.h" -#include "src/core/ext/client_config/resolver_registry.h" +#include "src/core/ext/client_channel/lb_policy_factory.h" +#include "src/core/ext/client_channel/method_config.h" +#include "src/core/ext/client_channel/parse_address.h" +#include "src/core/ext/client_channel/resolver_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" |