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/pick_first | |
| parent | af842451318f73d0fd2dcb55f02baaa70c82f3f9 (diff) | |
| parent | d9cbec465db305368b04d13409665bd711fa78cf (diff) | |
Merge remote-tracking branch 'upstream/master' into resolver_channel_args
Diffstat (limited to 'src/core/ext/lb_policy/pick_first')
| -rw-r--r-- | src/core/ext/lb_policy/pick_first/pick_first.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/lb_policy/pick_first/pick_first.c b/src/core/ext/lb_policy/pick_first/pick_first.c index d95f0310b6..d3166f3416 100644 --- a/src/core/ext/lb_policy/pick_first/pick_first.c +++ b/src/core/ext/lb_policy/pick_first/pick_first.c @@ -35,8 +35,8 @@ #include <grpc/support/alloc.h> -#include "src/core/ext/client_config/lb_policy_registry.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/ext/client_channel/lb_policy_registry.h" #include "src/core/lib/transport/connectivity_state.h" typedef struct pending_pick { |