Merge branch '1.4'
This commit is contained in:
commit
65eff683dd
1 file changed
+4
-1
+4
-1
@@ -394,7 +394,10 @@ func (alloc *Allocator) AdminTakeoverRanges(peerNameOrNickname string) error {
|
||||
}
|
||||
|
||||
newRanges, err := alloc.ring.Transfer(peername, alloc.ourName)
|
||||
alloc.space.AddRanges(newRanges)
|
||||
if err == nil && len(newRanges) > 0 {
|
||||
alloc.space.AddRanges(newRanges)
|
||||
alloc.gossip.GossipBroadcast(alloc.Gossip())
|
||||
}
|
||||
resultChan <- err
|
||||
}
|
||||
return <-resultChan
|
||||
|
||||
Reference in new issue
Block a user