Merge branch 'master' into etcd-0.1

masterelection/masterelection.go

@@ -59,7 +59,9 @@ func (m *MasterElection) setState(state int) {
 	if m.State == state {
 		return
 	}
-	log.Printf("masterelection: status=%s", stateToString(state))
+	log.Printf("masterelection: %s -> %s",
+		stateToString(m.State),
+		stateToString(state))
 	if m.StateChange != nil {
 		m.StateChange <- state
 	}

node/node.go

@@ -251,6 +251,9 @@ func (rc *RadioNode) Run() {
 	// Start the presence heartbeat.
 	go rc.presence()
 
+	// Start the masterelection runner.
+	go rc.me.Run()
+
 	log.Printf("starting icecast updater")
 	for {
 		select {