Merge pull request #1593 from unihorn/200

etcdserver: print out initial cluster members

etcdmain/etcd.go

@@ -152,7 +152,6 @@ func startEtcd() {
 	if err != nil {
 		log.Fatalf("etcd: error setting up initial cluster: %v", err)
 	}
-	log.Printf("etcd: initial cluster members: %s", cls.String())
 
 	if *dir == "" {
 		*dir = fmt.Sprintf("%v.etcd", *name)

etcdserver/server.go

@@ -216,6 +216,7 @@ func NewServer(cfg *ServerConfig) *EtcdServer {
 			}
 		}
 		cfg.Cluster.SetStore(st)
+		log.Printf("etcdserver: initial cluster members: %s", cfg.Cluster)
 		id, n, w = startNode(cfg, cfg.Cluster.MemberIDs())
 	case haveWAL:
 		if cfg.ShouldDiscover() {