Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xds: promote XdsNameResolver2 #7416

Merged
merged 1 commit into from Sep 11, 2020
Merged

xds: promote XdsNameResolver2 #7416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion xds/src/main/java/io/grpc/xds/ClusterManagerLoadBalancer.java
View file
Open in desktop
Expand Up @@ -145,7 +145,7 @@ private void updateOverallBalancingState() {
@Override
public PickResult pickSubchannel(PickSubchannelArgs args) {
String clusterName =
args.getCallOptions().getOption(XdsNameResolver2.CLUSTER_SELECTION_KEY);
args.getCallOptions().getOption(XdsNameResolver.CLUSTER_SELECTION_KEY);
SubchannelPicker delegate = childPickers.get(clusterName);
if (delegate == null) {
return
Expand Down
496 changes: 258 additions & 238 deletions xds/src/main/java/io/grpc/xds/XdsNameResolver.java
View file
Open in desktop

Large diffs are not rendered by default.

374 changes: 0 additions & 374 deletions xds/src/main/java/io/grpc/xds/XdsNameResolver2.java
View file
Open in desktop

This file was deleted.