Merge branch 'release-5.3' into 5.3-kafka-configuration

pingcap · Feb 21, 2022 · 66cdc4c · 66cdc4c
2 parents 4482ac6 + c8158a3
commit 66cdc4c
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 5 deletions.
diff --git a/dm/dm/ctl/ctl.go b/dm/dm/ctl/ctl.go
@@ -50,6 +50,9 @@ func NewRootCmd() *cobra.Command {
 		Short:         "DM control",
 		SilenceUsage:  true,
 		SilenceErrors: true,
+		CompletionOptions: cobra.CompletionOptions{
+			DisableDefaultCmd: true,
+		},
 	}
 	// --worker worker1 -w worker2 --worker=worker3,worker4 -w=worker5,worker6
 	cmd.PersistentFlags().StringSliceVarP(&commandMasterFlags.workers, "source", "s", []string{}, "MySQL Source ID.")

diff --git a/go.mod b/go.mod
@@ -64,7 +64,7 @@ require (
 	github.com/rakyll/statik v0.1.7
 	github.com/shopspring/decimal v1.3.0
 	github.com/soheilhy/cmux v0.1.5
-	github.com/spf13/cobra v1.0.0
+	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14