Fix master after merging conflicting PRs #1531 and #1584

They both passed tests separately and were no source-line conflicts ... but shit happens.
weaveworks · Jun 15, 2016 · 0587c6a · 0587c6a
1 parent 5d07b99
commit 0587c6a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/probe/docker/registry.go b/probe/docker/registry.go
@@ -44,7 +44,7 @@ type Registry interface {
 	WatchContainerUpdates(ContainerUpdateWatcher)
 	GetContainer(string) (Container, bool)
 	GetContainerByPrefix(string) (Container, bool)
-	GetContainerImage(string) (*docker_client.APIImages, bool)
+	GetContainerImage(string) (docker_client.APIImages, bool)
 }
 
 // ContainerUpdateWatcher is the type of functions that get called when containers are updated.
@@ -417,7 +417,7 @@ func (r *registry) GetContainerByPrefix(prefix string) (Container, bool) {
 	return nil, false
 }
 
-func (r *registry) GetContainerImage(id string) (*docker_client.APIImages, bool) {
+func (r *registry) GetContainerImage(id string) (docker_client.APIImages, bool) {
 	r.RLock()
 	defer r.RUnlock()
 	image, ok := r.images[id]

diff --git a/probe/docker/reporter_test.go b/probe/docker/reporter_test.go
@@ -48,7 +48,7 @@ func (r *mockRegistry) GetContainer(_ string) (docker.Container, bool) { return
 
 func (r *mockRegistry) GetContainerByPrefix(_ string) (docker.Container, bool) { return nil, false }
 
-func (r *mockRegistry) GetContainerImage(id string) (*client.APIImages, bool) {
+func (r *mockRegistry) GetContainerImage(id string) (client.APIImages, bool) {
 	image, ok := r.images[id]
 	return image, ok
 }