From e245abcc4dca93c6551f02a8ae21ce39a9eb7510 Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosby.michael@gmail.com>
Date: Wed, 2 Oct 2013 13:58:43 -0700
Subject: [PATCH] Fix rebase conflicts from master

---
 api_test.go | 2 +-
 runtime.go  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api_test.go b/api_test.go
index d5a7d1cc4..fe44e6548 100644
--- a/api_test.go
+++ b/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"},
diff --git a/runtime.go b/runtime.go
index f8520f62e..11ce1f382 100644
--- a/runtime.go
+++ b/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
 }