Merge pull request #1803 from junxu/master

etcdmain: Fix misuse "-addr" flag
This commit is contained in:
Xiang Li 2014-12-11 09:45:17 -08:00
commit 0416503124

View File

@ -196,7 +196,7 @@ func Main() {
// startEtcd launches the etcd server and HTTP handlers for client/server communication.
func startEtcd() (<-chan struct{}, error) {
apurls, err := flags.URLsFromFlags(fs, "initial-advertise-peer-urls", "addr", peerTLSInfo)
apurls, err := flags.URLsFromFlags(fs, "initial-advertise-peer-urls", "peer-addr", peerTLSInfo)
if err != nil {
return nil, err
}
@ -327,7 +327,7 @@ func startEtcd() (<-chan struct{}, error) {
// startProxy launches an HTTP proxy for client communication which proxies to other etcd nodes.
func startProxy() error {
apurls, err := flags.URLsFromFlags(fs, "initial-advertise-peer-urls", "addr", peerTLSInfo)
apurls, err := flags.URLsFromFlags(fs, "initial-advertise-peer-urls", "peer-addr", peerTLSInfo)
if err != nil {
return err
}