Skip to content

Commit

Permalink
Update dependencies to use weaveworks/common upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
@clickyotomy
clickyotomy committed Nov 3, 2019
1 parent f7aaf6e commit c698589
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 18 deletions.
4 changes: 1 addition & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ require (
github.com/stretchr/testify v1.4.0
github.com/tonistiigi/fifo v0.0.0-20190226154929-a9fb20d87448
github.com/ugorji/go v1.1.7 // indirect
github.com/weaveworks/common v0.0.0-20190822150010-afb9996716e4
github.com/weaveworks/common v0.0.0-20191103151037-0e7cefadc44f
go.etcd.io/etcd v0.0.0-20190815204525-8f85f0dc2607 // indirect
go.opencensus.io v0.22.1 // indirect
go.uber.org/atomic v1.4.0 // indirect
Expand All @@ -67,8 +67,6 @@ require (
k8s.io/klog v0.4.0
)

replace github.com/weaveworks/common => github.com/sandlis/weaveworks-common v0.0.0-20190822064708-8fa0a1ca9d89

replace github.com/hpcloud/tail => github.com/grafana/tail v0.0.0-20191024143944-0b54ddf21fe7

// Override reference that causes an error from Go proxy - see https://github.com/golang/go/issues/33558
Expand Down
6 changes: 4 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,8 +525,6 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb
github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/samuel/go-zookeeper v0.0.0-20190810000440-0ceca61e4d75 h1:cA+Ubq9qEVIQhIWvP2kNuSZ2CmnfBJFSRq+kO1pu2cc=
github.com/samuel/go-zookeeper v0.0.0-20190810000440-0ceca61e4d75/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
github.com/sandlis/weaveworks-common v0.0.0-20190822064708-8fa0a1ca9d89 h1:Dop0x86c8v6sOhFX8JPHP2TQ4NdvMgtwAnzOxmK06Ww=
github.com/sandlis/weaveworks-common v0.0.0-20190822064708-8fa0a1ca9d89/go.mod h1:Gpi+45Cxn+Urtspw4hzsAtdiXjxBVdt3lipoh4aa/AU=
github.com/satori/go.uuid v0.0.0-20160603004225-b111a074d5ef/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
Expand Down Expand Up @@ -587,6 +585,10 @@ github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/weaveworks/billing-client v0.0.0-20171006123215-be0d55e547b1/go.mod h1:7gGdEUJaCrSlWi/mjd68CZv0sfqektYPDcro9cE+M9k=
github.com/weaveworks/common v0.0.0-20190822150010-afb9996716e4 h1:O8BmyjqQoByXjAj6XaTfcxxqSIK6DYLmOSiYQPL9yJg=
github.com/weaveworks/common v0.0.0-20190822150010-afb9996716e4/go.mod h1:pSm+0KR57BG3pvGoJWFXJSAC7+sEPewcvdt5StevL3A=
github.com/weaveworks/common v0.0.0-20191103151037-0e7cefadc44f h1:i423tFVikRDF9fS/STNgbQEr2rqEoZq7rryVsm/GwGQ=
github.com/weaveworks/common v0.0.0-20191103151037-0e7cefadc44f/go.mod h1:pSm+0KR57BG3pvGoJWFXJSAC7+sEPewcvdt5StevL3A=
github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZGz7M=
github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
Expand Down
4 changes: 2 additions & 2 deletions pkg/promtail/promtail_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,9 +537,9 @@ func buildTestConfig(t *testing.T, positionsFileName string, logDirName string)
flagext.RegisterFlags(&cfg)

const hostname = "localhost"
cfg.ServerConfig.HTTPListenHost = hostname
cfg.ServerConfig.HTTPListenAddress = hostname
cfg.ServerConfig.ExternalURL = hostname
cfg.ServerConfig.GRPCListenHost = hostname
cfg.ServerConfig.GRPCListenAddress = hostname
cfg.ServerConfig.HTTPListenPort = httpTestPort

// Override some of those defaults
Expand Down
10 changes: 9 additions & 1 deletion vendor/github.com/weaveworks/common/aws/config.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions vendor/github.com/weaveworks/common/server/server.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ github.com/uber/jaeger-lib/metrics
github.com/uber/jaeger-lib/metrics/prometheus
# github.com/ugorji/go/codec v1.1.7
github.com/ugorji/go/codec
# github.com/weaveworks/common v0.0.0-20190822150010-afb9996716e4 => github.com/sandlis/weaveworks-common v0.0.0-20190822064708-8fa0a1ca9d89
# github.com/weaveworks/common v0.0.0-20191103151037-0e7cefadc44f
github.com/weaveworks/common/aws
github.com/weaveworks/common/errors
github.com/weaveworks/common/httpgrpc
Expand Down

0 comments on commit c698589

Please sign in to comment.