backport of commit ac26dfa

hashicorp · Feb 17, 2023 · f1a9d14 · f1a9d14
1 parent cfdbacf
commit f1a9d14
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1310,8 +1310,7 @@ workflows:
           filters:
             branches:
               only:
-                - release/0.49.x
-                - release/1.0.x
+                - release/1.1.x
     jobs:
       - build-distro:
           OS: "linux"

diff --git a/cli/cmd/troubleshoot/upstreams/upstreams.go b/cli/cmd/troubleshoot/upstreams/upstreams.go
@@ -3,7 +3,6 @@ package upstreams
 import (
 	"fmt"
 	"net"
-	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -246,7 +245,6 @@ func formatClusterNames(names map[string]struct{}) string {
 	for k := range names {
 		out = append(out, k)
 	}
-	sort.Strings(out)
 	return strings.Join(out, ", ")
 }