Fix rebase conflicts from master

api_test.go

@@ -985,7 +985,7 @@ func TestPostContainersAttachStderr(t *testing.T) {
 
 	srv := &Server{runtime: runtime}
 
-	container, err := runtime.Create(
+	container, _, err := runtime.Create(
 		&Config{
 			Image:     GetTestImage(runtime).ID,
 			Cmd:       []string{"/bin/sh", "-c", "/bin/cat >&2"},

runtime.go

@@ -176,7 +176,7 @@ func (runtime *Runtime) Register(container *Container) error {
 	} else if !nomonitor {
 		hostConfig, _ := container.ReadHostConfig()
 		container.allocateNetwork(hostConfig)
-		go container.monitor()
+		go container.monitor(hostConfig)
 	}
 	return nil
 }