Merge branch '1.4'

common/docker/client.go

@@ -98,7 +98,7 @@ func (c *Client) AddObserver(ob ContainerObserver) error {
 func (c *Client) IsContainerNotRunning(idStr string) bool {
 	container, err := c.InspectContainer(idStr)
 	if err == nil {
-		return !container.State.Running
+		return !container.State.Running || container.State.Restarting
 	}
 	if _, notThere := err.(*docker.NoSuchContainer); notThere {
 		return true

proxy/proxy.go

@@ -474,7 +474,7 @@ func (proxy *Proxy) attach(containerID string, orDie bool) error {
 		Log.Infof("Attaching weave router container: %s", container.ID)
 		return callWeaveAttach(container, []string{"attach-router"})
 	}
-	if !containerShouldAttach(container) || !(container.State.Running || container.State.Paused) {
+	if !containerShouldAttach(container) || !container.State.Running {
 		return nil
 	}