Merge pull request #2222 from yichengq/315

migrate/starter: unset discovery when setting initial-cluster

.travis.yml

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

migrate/starter/starter.go

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