diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-10-25 11:26:17 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-10-25 11:26:17 -0700 |
| commit | f1cd4490303c0c581777ec52987884e61bbe030d (patch) | |
| tree | 964e499763da984ed10337a0f32214e919cb84c8 /src/core/ext/resolver/dns | |
| parent | 43aa9a12b96614242a4b385b423a5a2a28569a42 (diff) | |
| parent | b40a8fa95b8ede3fe35e7f07bf902cde807879b2 (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_buildin
Diffstat (limited to 'src/core/ext/resolver/dns')
| -rw-r--r-- | src/core/ext/resolver/dns/native/dns_resolver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ext/resolver/dns/native/dns_resolver.c b/src/core/ext/resolver/dns/native/dns_resolver.c index fa33ffd7bd..b4ceee340e 100644 --- a/src/core/ext/resolver/dns/native/dns_resolver.c +++ b/src/core/ext/resolver/dns/native/dns_resolver.c @@ -37,9 +37,9 @@ #include <grpc/support/host_port.h> #include <grpc/support/string_util.h> -#include "src/core/ext/client_config/http_connect_handshaker.h" -#include "src/core/ext/client_config/lb_policy_registry.h" -#include "src/core/ext/client_config/resolver_registry.h" +#include "src/core/ext/client_channel/http_connect_handshaker.h" +#include "src/core/ext/client_channel/lb_policy_registry.h" +#include "src/core/ext/client_channel/resolver_registry.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/support/backoff.h" |