Merge pull request #8297 from fanminshi/fix_txn_ctl

etcdctl: print "del" instead of "delete" in txn interactive mode
etcd-io · Jul 24, 2017 · dfd3ef4 · dfd3ef4
2 parents e9a7f35 + 09f67a0
commit dfd3ef4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/e2e/ctl_v3_txn_test.go b/e2e/ctl_v3_txn_test.go
@@ -119,7 +119,7 @@ func ctlV3Txn(cx ctlCtx, rqs txnRequests) error {
 		return err
 	}
 
-	_, err = proc.Expect("success requests (get, put, delete):")
+	_, err = proc.Expect("success requests (get, put, del):")
 	if err != nil {
 		return err
 	}
@@ -132,7 +132,7 @@ func ctlV3Txn(cx ctlCtx, rqs txnRequests) error {
 		return err
 	}
 
-	_, err = proc.Expect("failure requests (get, put, delete):")
+	_, err = proc.Expect("failure requests (get, put, del):")
 	if err != nil {
 		return err
 	}

diff --git a/etcdctl/ctlv3/command/txn_command.go b/etcdctl/ctlv3/command/txn_command.go
@@ -52,9 +52,9 @@ func txnCommandFunc(cmd *cobra.Command, args []string) {
 	txn := mustClientFromCmd(cmd).Txn(context.Background())
 	promptInteractive("compares:")
 	txn.If(readCompares(reader)...)
-	promptInteractive("success requests (get, put, delete):")
+	promptInteractive("success requests (get, put, del):")
 	txn.Then(readOps(reader)...)
-	promptInteractive("failure requests (get, put, delete):")
+	promptInteractive("failure requests (get, put, del):")
 	txn.Else(readOps(reader)...)
 
 	resp, err := txn.Commit()