Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5760 from gyuho/peer-urls

Browse Source 
*: change ctlv3 flag peerURLs to 'peer-urls'
This commit is contained in:
Gyu-Ho Lee 2016-06-23 10:12:28 -07:00 committed by GitHub
commit 9664df1b5e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/ctl_v3_member_test.go
View File

@ -106,7 +106,7 @@ func ctlV3MemberRemove(cx ctlCtx, memberID, clusterID string) error {
func memberAddTest(cx ctlCtx) {
peerURL := fmt.Sprintf("http://localhost:%d", etcdProcessBasePort+11)
cmdArgs := append(cx.PrefixArgs(), "member", "add", "newmember", fmt.Sprintf("--peerURLs=%s", peerURL))
cmdArgs := append(cx.PrefixArgs(), "member", "add", "newmember", fmt.Sprintf("--peer-urls=%s", peerURL))
if err := spawnWithExpect(cmdArgs, " added to cluster "); err != nil {
cx.t.Fatal(err)
}
@ -140,7 +140,7 @@ func memberUpdateTest(cx ctlCtx) {
}
peerURL := fmt.Sprintf("http://localhost:%d", etcdProcessBasePort+11)
cmdArgs := append(cx.PrefixArgs(), "member", "update", fmt.Sprintf("%x", mr.Members[0].ID), fmt.Sprintf("--peerURLs=%s", peerURL))
cmdArgs := append(cx.PrefixArgs(), "member", "update", fmt.Sprintf("%x", mr.Members[0].ID), fmt.Sprintf("--peer-urls=%s", peerURL))
if err = spawnWithExpect(cmdArgs, " updated in cluster "); err != nil {
cx.t.Fatal(err)
}

8
etcdctl/README.md
View File

@ -351,7 +351,7 @@ MEMBER ADD introduces a new member into the etcd cluster as a new peer.
#### Options
- peerURLs -- comma separated list of URLs to associate with the new member.
- peer-urls -- comma separated list of URLs to associate with the new member.
#### Return value
@ -362,7 +362,7 @@ MEMBER ADD introduces a new member into the etcd cluster as a new peer.
#### Example
```bash
./etcdctl member add newMember --peerURLs=https://127.0.0.1:12345
./etcdctl member add newMember --peer-urls=https://127.0.0.1:12345
Member 2be1eb8f84b7f63e added to cluster ef37ad9dc622a7c4
```
@ -373,7 +373,7 @@ MEMBER UPDATE sets the peer URLs for an existing member in the etcd cluster.
#### Options
- peerURLs -- comma separated list of URLs to associate with the updated member.
- peer-urls -- comma separated list of URLs to associate with the updated member.
#### Return value
@ -384,7 +384,7 @@ MEMBER UPDATE sets the peer URLs for an existing member in the etcd cluster.
#### Example
```bash
./etcdctl member update 2be1eb8f84b7f63e --peerURLs=https://127.0.0.1:11112
./etcdctl member update 2be1eb8f84b7f63e --peer-urls=https://127.0.0.1:11112
Member 2be1eb8f84b7f63e updated in cluster ef37ad9dc622a7c4
```

4
etcdctl/ctlv3/command/member_command.go
View File

@ -48,7 +48,7 @@ func NewMemberAddCommand() *cobra.Command {
Run: memberAddCommandFunc,
}
cc.Flags().StringVar(&memberPeerURLs, "peerURLs", "", "comma separated peer URLs for the new member.")
cc.Flags().StringVar(&memberPeerURLs, "peer-urls", "", "comma separated peer URLs for the new member.")
return cc
}
@ -74,7 +74,7 @@ func NewMemberUpdateCommand() *cobra.Command {
Run: memberUpdateCommandFunc,
}
cc.Flags().StringVar(&memberPeerURLs, "peerURLs", "", "comma separated peer URLs for the updated member.")
cc.Flags().StringVar(&memberPeerURLs, "peer-urls", "", "comma separated peer URLs for the updated member.")
return cc
}