github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-02-15 10:29:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Use mflag package from weaveworks fork until we find a better solution
This commit is contained in:
Alfonso Acosta
2016-08-26 12:24:52 +01:00
committed by GitHub
parent e03000810f b895344d2b
commit 45dcdd584d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runner/runner.go
View File

@@ -14,8 +14,8 @@ import (
"sync"
"time"
"github.com/docker/docker/pkg/mflag"
"github.com/mgutz/ansi"
"github.com/weaveworks/docker/pkg/mflag"
)
const (

2
socks/main.go
View File

@@ -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"
)