diff options
author | Craig Tiller <ctiller@google.com> | 2016-04-01 12:30:06 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-04-01 12:30:06 -0700 |
commit | b11b34a71e4aec3b8738e2600c1da4bed4c939d9 (patch) | |
tree | 6499ce04eb4bcfb777e6a0ce1a28340bc35182ce | |
parent | 5dec6e0e7590da050231f9da2eb60aae49dffcea (diff) |
Zookeeper fixes
-rw-r--r-- | BUILD | 2 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | build.yaml | 2 | ||||
-rw-r--r-- | src/core/ext/resolver/zookeeper/zookeeper_resolver.c | 2 | ||||
-rw-r--r-- | tools/run_tests/sources_and_headers.json | 2 |
5 files changed, 4 insertions, 6 deletions
@@ -819,7 +819,7 @@ cc_library( cc_library( name = "grpc_zookeeper", srcs = [ - "src/core/ext/resolver/zookeeper_resolver.c", + "src/core/ext/resolver/zookeeper/zookeeper_resolver.c", ], hdrs = [ "include/grpc/grpc_zookeeper.h", @@ -3012,7 +3012,7 @@ endif LIBGRPC_ZOOKEEPER_SRC = \ - src/core/ext/resolver/zookeeper_resolver.c \ + src/core/ext/resolver/zookeeper/zookeeper_resolver.c \ PUBLIC_HEADERS_C += \ include/grpc/grpc_zookeeper.h \ diff --git a/build.yaml b/build.yaml index c74abcc200..a0ebe41247 100644 --- a/build.yaml +++ b/build.yaml @@ -766,7 +766,7 @@ libs: public_headers: - include/grpc/grpc_zookeeper.h src: - - src/core/ext/resolver/zookeeper_resolver.c + - src/core/ext/resolver/zookeeper/zookeeper_resolver.c deps: - gpr - grpc diff --git a/src/core/ext/resolver/zookeeper/zookeeper_resolver.c b/src/core/ext/resolver/zookeeper/zookeeper_resolver.c index a66c9925f0..8a600a8072 100644 --- a/src/core/ext/resolver/zookeeper/zookeeper_resolver.c +++ b/src/core/ext/resolver/zookeeper/zookeeper_resolver.c @@ -31,8 +31,6 @@ * */ -#include "src/core/lib/client_config/resolvers/zookeeper_resolver.h" - #include <string.h> #include <grpc/support/alloc.h> diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index ef5b500ed8..afb4c32817 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -5153,7 +5153,7 @@ "name": "grpc_zookeeper", "src": [ "include/grpc/grpc_zookeeper.h", - "src/core/ext/resolver/zookeeper_resolver.c" + "src/core/ext/resolver/zookeeper/zookeeper_resolver.c" ], "third_party": false, "type": "lib" |