Merge pull request #1456 from weaveworks/fix-race-condition

[proxy] fix race condition when waiting for containers to start

proxy/proxy.go

@@ -312,7 +312,7 @@ func (proxy *Proxy) waitForStart(r *http.Request) {
 		ch = wait.ch
 	}
 	proxy.Unlock()
-	if found {
+	if ch != nil {
 		Log.Debugf("Wait for start of container %s", wait.ident)
 		<-ch
 	}