Bryan Boreham
|
1e5cdc4210
|
Merge commit '7f4bab626e5544d14293f2ab79b2b0642125476a'
|
2018-08-10 12:31:52 +00:00 |
|
Bryan Boreham
|
cfc460270a
|
Undo changes made in the 'tools' subtree
This is vendor'd in from weaveworks/build-tools so must not be changed
here.
|
2018-08-10 11:54:26 +00:00 |
|
Marc Carré
|
2ba50b8b3d
|
Update golang.org/x/net/context to latest
```
$ gvt delete golang.org/x/net/context
$ gvt fetch golang.org/x/net/context
2018/07/23 18:03:49 Fetching: golang.org/x/net/context
$ git grep -l "golang.org/x/net/context" | grep -v vendor | xargs sed -i '' 's:golang.org/x/net/context:context:g'
$ git grep -l "context/ctxhttp" | grep -v vendor | xargs sed -i '' 's:context/ctxhttp:golang.org/x/net/context/ctxhttp:g'
$ gofmt -s -w app
$ gofmt -s -w common
$ gofmt -s -w probe
$ gofmt -s -w prog
$ gofmt -s -w tools
```
fixed a bunch of:
```
cannot use func literal (type func("github.com/weaveworks/scope/vendor/golang.org/x/net/context".Context) error) as type func("context".Context) error
```
|
2018-07-23 20:10:18 +02:00 |
|
Alessandro Puccetti
|
d1f5fcaaec
|
Merge commit '6a1af9ac0e65098e0b4e914ce451f6bd1e659f60' into alessandro/integration-fix
|
2017-02-21 16:55:24 +01:00 |
|
Alfonso Acosta
|
151ce44d37
|
Merge commit '4fe078a730d70c7936f1c43a1eca881f934bffce'
|
2016-08-26 13:17:55 +00:00 |
|
Tom Wilkie
|
315a3f6b55
|
Merge commit '8b5ff7765ab5ec63e84862d9332383ba856f8367' into misspell
|
2016-03-23 11:18:39 +00:00 |
|
Tom Wilkie
|
9878967263
|
Merge commit 'a7eef92988bac018db216ba2cc0325d82b42d44f'
|
2015-12-07 14:53:05 +00:00 |
|
Tom Wilkie
|
011a55358f
|
Merge commit '8b52b10e38553a35d8134b428d6118a1ac011804' as 'tools'
|
2015-10-26 15:13:15 +00:00 |
|