Merge branch '1.0'

Conflicts:
	ipam/ring/ring_test.go

ipam/ring/ring_test.go

@@ -597,7 +597,7 @@ func TestFuzzRing(t *testing.T) {
 }
 
 func TestFuzzRingHard(t *testing.T) {
-	//common.InitDefaultLogging(true)
+	//common.SetLogLevel("debug")
 	var (
 		numPeers   = 100
 		iterations = 3000
@@ -644,13 +644,8 @@ func TestFuzzRingHard(t *testing.T) {
 			return
 		}
 
+		// Pick one peer to remove, and a different one to transfer to
 		peerIndex, peername, _ := randomPeer(-1)
-		// Remove peer from our state
-		peers = append(peers[:peerIndex], peers[peerIndex+1:]...)
-		rings = append(rings[:peerIndex], rings[peerIndex+1:]...)
-		theRanges = make(map[int][]address.Range)
-
-		// Transfer the space for this peer on another peer, but not this one
 		_, otherPeername, otherRing := randomPeer(peerIndex)
 
 		// We need to be in a ~converged ring to rmpeer
@@ -659,7 +654,12 @@ func TestFuzzRingHard(t *testing.T) {
 		}
 
 		common.Log.Debugf("%s: transferring from peer %s", otherPeername, peername)
-		otherRing.Transfer(peername, peername)
+		otherRing.Transfer(peername, otherPeername)
+
+		// Remove peer from our state
+		peers = append(peers[:peerIndex], peers[peerIndex+1:]...)
+		rings = append(rings[:peerIndex], rings[peerIndex+1:]...)
+		theRanges = make(map[int][]address.Range)
 
 		// And now tell everyone about the transfer - rmpeer is
 		// not partition safe