From 85e465cfa41d055665b1daf52025836875eea65b Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 26 Nov 2015 17:16:43 +0000
Subject: [PATCH] Eliminate 'dockerer'

---
 plugin/docker.go  |  9 ---------
 plugin/watcher.go | 10 +++-------
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 plugin/docker.go

diff --git a/plugin/docker.go b/plugin/docker.go
deleted file mode 100644
index 4934d737..00000000
--- a/plugin/docker.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package plugin
-
-import (
-	"github.com/weaveworks/weave/common/docker"
-)
-
-type dockerer struct {
-	client *docker.Client
-}
diff --git a/plugin/watcher.go b/plugin/watcher.go
index 3dbbe504..701c53b9 100644
--- a/plugin/watcher.go
+++ b/plugin/watcher.go
@@ -14,19 +14,15 @@ const (
 )
 
 type watcher struct {
-	dockerer
-	weave *weaveapi.Client
+	client *docker.Client
+	weave  *weaveapi.Client
 }
 
 type Watcher interface {
 }
 
 func NewWatcher(client *docker.Client) (Watcher, error) {
-	w := &watcher{
-		dockerer: dockerer{
-			client: client,
-		},
-	}
+	w := &watcher{client: client}
 	err := client.AddObserver(w)
 	if err != nil {
 		return nil, err