mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2222 from yichengq/315

Browse Source 
migrate/starter: unset discovery when setting initial-cluster
This commit is contained in:
Yicheng Qin
2015-02-03 23:27:43 -08:00
parent 378fa46b7d a0f8aa1add
commit 58cb9a3b76
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -1,11 +1,11 @@
language: go language: go
sudo: false sudo: false
go: go:
- 1.3 - 1.4
install: install:
- go get code.google.com/p/go.tools/cmd/cover - go get golang.org/x/tools/cmd/cover
- go get code.google.com/p/go.tools/cmd/vet - go get golang.org/x/tools/cmd/vet
script: script:
- INTEGRATION=y ./test - INTEGRATION=y ./test

1
migrate/starter/starter.go
View File

@ -123,6 +123,7 @@ func checkInternalVersion(fs *flag.FlagSet) version {
return internalV1 return internalV1
} }
if ver == internalV2 { if ver == internalV2 {
os.Unsetenv("ETCD_DISCOVERY")
os.Args = append(os.Args, "-initial-cluster", standbyInfo.InitialCluster()) os.Args = append(os.Args, "-initial-cluster", standbyInfo.InitialCluster())
return internalV2Proxy return internalV2Proxy
} }