diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-10-21 15:54:42 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-10-21 15:54:42 -0700 |
| commit | b516cadc2a9f521ba02282475db8eac987b4f691 (patch) | |
| tree | 522fedb19f91fce46ebfe2ec0040660f45ccfa19 /src/core/ext/lb_policy/grpclb/grpclb.c | |
| parent | 6a30178ef2c936a8929d03a3163647882110052e (diff) | |
| parent | d9cbec465db305368b04d13409665bd711fa78cf (diff) | |
Merge branch 'master' into uv_core_transport
Diffstat (limited to 'src/core/ext/lb_policy/grpclb/grpclb.c')
| -rw-r--r-- | src/core/ext/lb_policy/grpclb/grpclb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c index 0180076a44..3a37001dfb 100644 --- a/src/core/ext/lb_policy/grpclb/grpclb.c +++ b/src/core/ext/lb_policy/grpclb/grpclb.c @@ -109,10 +109,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" |