Fix rebase conflicts from master
diff --git a/api_test.go b/api_test.go
index d5a7d1c..fe44e65 100644
--- a/api_test.go
+++ b/api_test.go
@@ -985,7 +985,7 @@
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"},
diff --git a/runtime.go b/runtime.go
index f8520f6..11ce1f3 100644
--- a/runtime.go
+++ b/runtime.go
@@ -176,7 +176,7 @@
} else if !nomonitor {
hostConfig, _ := container.ReadHostConfig()
container.allocateNetwork(hostConfig)
- go container.monitor()
+ go container.monitor(hostConfig)
}
return nil
}