github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-02 17:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix master after merging conflicting PRs #1531 and #1584

Browse Source 
They both passed tests separately and were no source-line conflicts ... but shit happens.
This commit is contained in:
Alfonso Acosta
2016-06-15 20:23:11 +00:00
parent 5d07b99e69
commit 0587c6a967
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
probe/docker/registry.go
View File

@@ -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]

2
probe/docker/reporter_test.go
View File

@@ -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
}