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 /src/core/ext/lb_policy/grpclb | |
| parent | af842451318f73d0fd2dcb55f02baaa70c82f3f9 (diff) | |
| parent | d9cbec465db305368b04d13409665bd711fa78cf (diff) | |
Merge remote-tracking branch 'upstream/master' into resolver_channel_args
Diffstat (limited to 'src/core/ext/lb_policy/grpclb')
| -rw-r--r-- | src/core/ext/lb_policy/grpclb/grpclb.c | 8 | ||||
| -rw-r--r-- | src/core/ext/lb_policy/grpclb/grpclb.h | 2 | ||||
| -rw-r--r-- | src/core/ext/lb_policy/grpclb/load_balancer_api.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c index 9784150eef..4594793518 100644 --- a/src/core/ext/lb_policy/grpclb/grpclb.c +++ b/src/core/ext/lb_policy/grpclb/grpclb.c @@ -107,10 +107,10 @@ #include <grpc/support/string_util.h> #include <grpc/support/time.h> -#include "src/core/ext/client_config/client_channel_factory.h" -#include "src/core/ext/client_config/lb_policy_factory.h" -#include "src/core/ext/client_config/lb_policy_registry.h" -#include "src/core/ext/client_config/parse_address.h" +#include "src/core/ext/client_channel/client_channel_factory.h" +#include "src/core/ext/client_channel/lb_policy_factory.h" +#include "src/core/ext/client_channel/lb_policy_registry.h" +#include "src/core/ext/client_channel/parse_address.h" #include "src/core/ext/lb_policy/grpclb/grpclb.h" #include "src/core/ext/lb_policy/grpclb/load_balancer_api.h" #include "src/core/lib/channel/channel_args.h" diff --git a/src/core/ext/lb_policy/grpclb/grpclb.h b/src/core/ext/lb_policy/grpclb/grpclb.h index 83552b4fa0..ff23f3a545 100644 --- a/src/core/ext/lb_policy/grpclb/grpclb.h +++ b/src/core/ext/lb_policy/grpclb/grpclb.h @@ -34,7 +34,7 @@ #ifndef GRPC_CORE_EXT_LB_POLICY_GRPCLB_GRPCLB_H #define GRPC_CORE_EXT_LB_POLICY_GRPCLB_GRPCLB_H -#include "src/core/ext/client_config/lb_policy_factory.h" +#include "src/core/ext/client_channel/lb_policy_factory.h" /** Returns a load balancing factory for the glb policy, which tries to connect * to a load balancing server to decide the next successfully connected diff --git a/src/core/ext/lb_policy/grpclb/load_balancer_api.h b/src/core/ext/lb_policy/grpclb/load_balancer_api.h index c1e73d08ef..079a64a3f3 100644 --- a/src/core/ext/lb_policy/grpclb/load_balancer_api.h +++ b/src/core/ext/lb_policy/grpclb/load_balancer_api.h @@ -36,7 +36,7 @@ #include <grpc/support/slice_buffer.h> -#include "src/core/ext/client_config/lb_policy_factory.h" +#include "src/core/ext/client_channel/lb_policy_factory.h" #include "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h" #ifdef __cplusplus |