From f42e275884ff65395296e1c280559bcd12f8ddf3 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Sat, 19 Mar 2016 13:57:20 +0000
Subject: [PATCH 1/2] broadcast ipam ring update after rmpeer

So that other peers notice the change more promptly.

Fixes #2068.
---
 ipam/allocator.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ipam/allocator.go b/ipam/allocator.go
index a9f3d13b..74168059 100644
--- a/ipam/allocator.go
+++ b/ipam/allocator.go
@@ -334,7 +334,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

From b1ec2b788a5a581b5d3bce55d344b06a6fd88d12 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Wed, 16 Mar 2016 13:14:40 +0000
Subject: [PATCH 2/2] Bump template name so it will fetch latest Docker

---
 test/gce.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/gce.sh b/test/gce.sh
index e42b9209..4e83fc22 100755
--- a/test/gce.sh
+++ b/test/gce.sh
@@ -11,7 +11,7 @@ set -e
 : ${SSH_KEY_FILE:=$HOME/.ssh/gce_ssh_key}
 : ${PROJECT:=positive-cocoa-90213}
 : ${IMAGE:=ubuntu-14-04}
-: ${TEMPLATE_NAME:=test-template-9}
+: ${TEMPLATE_NAME:=test-template-10}
 : ${ZONE:=us-central1-a}
 : ${NUM_HOSTS:=5}
 SUFFIX=""