Alfonso Acosta 0587c6a967 Fix master after merging conflicting PRs #1531 and #1584 ...

They both passed tests separately and were no source-line conflicts ... but shit happens.

2016-06-15 20:23:13 +00:00

..

container_test.go

Add test

2016-06-13 11:47:19 +00:00

container.go

Ignore IPv6 addresses in Docker reporter (#1552)

2016-06-15 16:05:12 +01:00

controls_test.go

Immediately remove deleted containers from the UI.

2016-04-21 12:26:51 +01:00

controls.go

Add pod delete control

2016-04-28 14:48:05 +01:00

registry_test.go

Review feedback

2016-06-14 16:53:23 +00:00

registry.go

Fix master after merging conflicting PRs #1531 and #1584

2016-06-15 20:23:13 +00:00

reporter_test.go

Fix master after merging conflicting PRs #1531 and #1584

2016-06-15 20:23:13 +00:00

reporter.go

Merge pull request #1584 from weaveworks/1563-read-docker-networks

2016-06-15 19:08:30 +01:00

tagger_test.go

Use image name without version as id. (#1531)

2016-06-15 16:14:51 +01:00

tagger.go

Use image name without version as id. (#1531)

2016-06-15 16:14:51 +01:00