Skip to content

Commit 7a687db

Browse files
pracucciAndre Branchizio
authored and
Andre Branchizio
committed
Upgrade Cortex (thanos-io#3828)
Signed-off-by: Marco Pracucci <[email protected]>
1 parent 2e85bb4 commit 7a687db

File tree

2 files changed

+231
-9
lines changed

2 files changed

+231
-9
lines changed

go.mod

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ require (
77
github.com/Azure/azure-storage-blob-go v0.8.0
88
github.com/NYTimes/gziphandler v1.1.1
99
github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15
10-
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
1110
github.com/aliyun/aliyun-oss-go-sdk v2.0.4+incompatible
12-
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
1311
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
1412
github.com/cespare/xxhash v1.1.0
1513
github.com/chromedp/cdproto v0.0.0-20200424080200-0de008e41fa0
1614
github.com/chromedp/chromedp v0.5.3
17-
github.com/cortexproject/cortex v1.6.1-0.20210215155036-dfededd9f331
15+
github.com/cortexproject/cortex v1.7.1-0.20210224085859-66d6fb5b0d42
1816
github.com/davecgh/go-spew v1.1.1
1917
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
2018
github.com/fatih/structtag v1.1.0
@@ -26,7 +24,6 @@ require (
2624
github.com/gogo/status v1.0.3
2725
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
2826
github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3
29-
github.com/gomodule/redigo v1.8.4 // indirect
3027
github.com/googleapis/gax-go v2.0.2+incompatible
3128
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
3229
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
@@ -55,7 +52,6 @@ require (
5552
github.com/uber/jaeger-client-go v2.25.0+incompatible
5653
github.com/uber/jaeger-lib v2.4.0+incompatible
5754
github.com/weaveworks/common v0.0.0-20210112142934-23c8d7fa6120
58-
github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da // indirect
5955
go.elastic.co/apm v1.5.0
6056
go.elastic.co/apm/module/apmot v1.5.0
6157
go.uber.org/atomic v1.7.0
@@ -78,7 +74,6 @@ replace (
7874
// Using a 3rd-party branch for custom dialer - see https://github.com/bradfitz/gomemcache/pull/86.
7975
// Required by Cortex https://github.com/cortexproject/cortex/pull/3051.
8076
github.com/bradfitz/gomemcache => github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab
81-
github.com/cortexproject/cortex => github.com/pracucci/cortex v0.0.0-20210223160359-b668aa375d55
8277
// Update to v1.1.1 to make sure windows CI pass.
8378
github.com/elastic/go-sysinfo => github.com/elastic/go-sysinfo v1.1.1
8479
// Make sure Prometheus version is pinned as Prometheus semver does not include Go APIs.

0 commit comments

Comments
 (0)