Merge #105337 #105346

105337: cli/start: soften some deprecation words r=mdlinville a=knz Fixes CRDB-28971 Epic: CRDB-28893 Before: ``` This feature will be removed in the next version of CockroachDB. ``` After: ``` This feature will be removed in a later version of CockroachDB. ``` Release note: None 105346: sql: enable secondary_region test r=chengxiong-ruan a=chengxiong-ruan we unskipped `regional_by_table` test in #104877 and haven't seen any error for 7 days now. But still unskipping one test at a time. Informs: #98020 Release note: None Co-authored-by: Raphael 'kena' Poss <[email protected]> Co-authored-by: Chengxiong Ruan <[email protected]>
cockroachdb · Jun 22, 2023 · 588959f · 588959f
3 parents 2c8e559 + 02c7709 + a201e68
commit 588959f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/pkg/ccl/multiregionccl/testdata/secondary_region b/pkg/ccl/multiregionccl/testdata/secondary_region
@@ -1,6 +1,3 @@
-skip issue-num=98020
-----
-
 new-cluster localities=us-east-1,us-east-1,us-west-1,us-west-1,us-central-1,us-central-1,us-central-1,eu-west-1,eu-west-1,eu-west-1
 ----
 

diff --git a/pkg/cli/start.go b/pkg/cli/start.go
@@ -1260,7 +1260,7 @@ func hintServerCmdFlags(ctx context.Context, cmd *cobra.Command) {
 	if !sqlAddrSpecified {
 		log.Ops.Shoutf(ctx, severity.WARNING,
 			"Running a server without --sql-addr, with a combined RPC/SQL listener, is deprecated.\n"+
-				"This feature will be removed in the next version of CockroachDB.")
+				"This feature will be removed in a later version of CockroachDB.")
 	}
 
 	changed := func(flagName string) bool {