diff --git a/go.mod b/go.mod index b3c9ff30c2..84383ca299 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( github.com/prometheus/prometheus v0.41.0 github.com/sony/gobreaker v0.5.0 github.com/stretchr/testify v1.8.1 - github.com/thanos-community/promql-engine v0.0.0-20230105130848-10d1c5433e10 + github.com/thanos-community/promql-engine v0.0.0-20230124070417-9e293186b7e4 github.com/thanos-io/objstore v0.0.0-20221205132204-5aafc0079f06 github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/uber/jaeger-lib v2.4.1+incompatible // indirect diff --git a/go.sum b/go.sum index 0956f678a5..bec4247b74 100644 --- a/go.sum +++ b/go.sum @@ -894,8 +894,13 @@ github.com/tencentyun/cos-go-sdk-v5 v0.7.34 h1:xm+Pg+6m486y4eugRI7/E4WasbVmpY1hp github.com/tencentyun/cos-go-sdk-v5 v0.7.34/go.mod h1:4dCEtLHGh8QPxHEkgq+nFaky7yZxQuYwgSJM87icDaw= github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e h1:f1Zsv7OAU9iQhZwigp50Yl38W10g/vd5NC8Rdk1Jzng= github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e/go.mod h1:jXcofnrSln/cLI6/dhlBxPQZEEQHVPCcFaH75M+nSzM= +<<<<<<< HEAD github.com/thanos-community/promql-engine v0.0.0-20230105130848-10d1c5433e10 h1:EqXi4AGE7wjoYjhc1ZiapAmgQEB79uImXiLgPiV4FoE= github.com/thanos-community/promql-engine v0.0.0-20230105130848-10d1c5433e10/go.mod h1:GJkKOtKfXos1xbTmHBnX3YTCov8enxdAS1woR6/h4CI= +======= +github.com/thanos-community/promql-engine v0.0.0-20230124070417-9e293186b7e4 h1:D0ruzvS/U+49eMLg/7IIYK2iMdVP4PrJLpVHgguMVkg= +github.com/thanos-community/promql-engine v0.0.0-20230124070417-9e293186b7e4/go.mod h1:d52Wfzxs6L3xhc2snodyWvM2bZMMVn0XT2q4vsfBPVo= +>>>>>>> e69ea697 (Update Thanos engine to latest version (#6069)) github.com/thanos-io/objstore v0.0.0-20221205132204-5aafc0079f06 h1:xUnLk2CwIoJyv6OB4MWC3aOH9TnneSgM5kgTsOmXIuI= github.com/thanos-io/objstore v0.0.0-20221205132204-5aafc0079f06/go.mod h1:gdo4vwwonBnheHB/TCwAOUtKJKrLhLtbBVTQR9rN/v0= github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab h1:7ZR3hmisBWw77ZpO1/o86g+JV3VKlk3d48jopJxzTjU=