Merge pull request #1922 from weaveworks/issues/1179-its-alive

In IPAM, resurrect apparently-dead containers on ContainerStarted event

ipam/allocator.go

@@ -263,7 +263,11 @@ func (alloc *Allocator) removeDeadContainers() {
 	}
 }
 
-func (alloc *Allocator) ContainerStarted(ident string) {}
+func (alloc *Allocator) ContainerStarted(ident string) {
+	alloc.actionChan <- func() {
+		delete(alloc.dead, ident) // delete is no-op if key not in map
+	}
+}
 
 // Delete (Sync) - release all IP addresses for container with given name
 func (alloc *Allocator) Delete(ident string) error {