|
|
@@ -1988,13 +1988,10 @@ add_library(grpc_unsecure
|
|
|
src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
|
|
|
src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc
|
|
|
src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
|
|
|
-<<<<<<< HEAD
|
|
|
- src/core/ext/filters/client_channel/lb_policy/xds/xds.cc
|
|
|
src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc
|
|
|
-=======
|
|
|
src/core/ext/filters/client_channel/lb_policy/xds/eds.cc
|
|
|
src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc
|
|
|
->>>>>>> upstream/master
|
|
|
+ src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc
|
|
|
src/core/ext/filters/client_channel/lb_policy_registry.cc
|
|
|
src/core/ext/filters/client_channel/local_subchannel_pool.cc
|
|
|
src/core/ext/filters/client_channel/parse_address.cc
|
Donna Dionne