From 1cbe361b08e639db531afaaa48ed58c0d7a89ef1 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

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

diff --git a/Dockerfile b/Dockerfile
index 22580d3c3..55fdc17ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,9 +37,9 @@ run apt-get install -y -q build-essential libsqlite3-dev
 
 # Install Go
 run	curl -s https://go.googlecode.com/files/go1.2rc1.src.tar.gz | tar -v -C /usr/local -xz
-run cd /usr/local/go/src && ./make.bash && go install -ldflags '-w -linkmode external -extldflags "-static -Wl,--unresolved-symbols=ignore-in-shared-libs"' -tags netgo -a std
 env	PATH	/usr/local/go/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
 env	GOPATH	/go:/go/src/github.com/dotcloud/docker/vendor
+run cd /usr/local/go/src && ./make.bash && go install -ldflags '-w -linkmode external -extldflags "-static -Wl,--unresolved-symbols=ignore-in-shared-libs"' -tags netgo -a std
 run	cd /tmp && echo 'package main' > t.go && go test -a -i -v
 # Ubuntu stuff
 run	apt-get install -y -q ruby1.9.3 rubygems libffi-dev
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
 }