Merge pull request #30808 from a-robinson/backport2.1-30747

release-2.1: cli: Mark zone command deprecated so it doesn't show up in help text
cockroachdb · Oct 1, 2018 · 123b1da · 123b1da
2 parents 58024e5 + 743d2dc
commit 123b1da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/cli/cli_test.go b/pkg/cli/cli_test.go
@@ -1808,7 +1808,6 @@ Available Commands:
 
   sql         open a sql shell
   user        get, set, list and remove users
-  zone        get, set, list and remove zones
   node        list, inspect or remove nodes
   dump        dump sql tables
 

diff --git a/pkg/cli/zone.go b/pkg/cli/zone.go
@@ -318,9 +318,10 @@ var zoneCmds = []*cobra.Command{
 }
 
 var zoneCmd = &cobra.Command{
-	Use:   "zone",
-	Short: "get, set, list and remove zones",
-	RunE:  usageAndErr,
+	Use:        "zone",
+	Short:      "get, set, list and remove zones",
+	RunE:       usageAndErr,
+	Deprecated: "use SHOW ZONE and CONFIGURE ZONE commands in a SQL client instead.",
 }
 
 func init() {