Merge pull request weaveworks#37 from weaveworks/fix-mflag-missing

Use mflag package from weaveworks fork until we find a better solution
kinvolk-archives · Aug 26, 2016 · 45dcdd5 · 45dcdd5
2 parents e030008 + b895344
commit 45dcdd5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/runner/runner.go b/runner/runner.go
@@ -14,8 +14,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/docker/docker/pkg/mflag"
 	"github.com/mgutz/ansi"
+	"github.com/weaveworks/docker/pkg/mflag"
 )
 
 const (

diff --git a/socks/main.go b/socks/main.go
@@ -9,7 +9,7 @@ import (
 	"text/template"
 
 	socks5 "github.com/armon/go-socks5"
-	"github.com/docker/docker/pkg/mflag"
+	"github.com/weaveworks/docker/pkg/mflag"
 	"github.com/weaveworks/weave/common/mflagext"
 	"golang.org/x/net/context"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,8 +14,8 @@ import ( @@
     	"sync"
     	"time"
-    	"github.com/docker/docker/pkg/mflag"
     	"github.com/mgutz/ansi"
+    	"github.com/weaveworks/docker/pkg/mflag"
     )
     const (
@@ Expand Down @@