Created
October 13, 2023 14:24
-
-
Save kylebrandt/436d61556f4d69a392b1fd3e232186ac to your computer and use it in GitHub Desktop.
pr.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/go.mod b/go.mod | |
| index 7534de9cfc..41d10ed8b3 100644 | |
| --- a/go.mod | |
| +++ b/go.mod | |
| @@ -124,7 +124,7 @@ require ( | |
| gopkg.in/mail.v2 v2.3.1 // @grafana/backend-platform | |
| gopkg.in/yaml.v2 v2.4.0 // indirect | |
| gopkg.in/yaml.v3 v3.0.1 // @grafana/alerting-squad-backend | |
| - xorm.io/builder v0.3.6 // @grafana/backend-platform | |
| + xorm.io/builder v0.3.6 // indirect; @grafana/backend-platform | |
| xorm.io/core v0.7.3 // @grafana/backend-platform | |
| xorm.io/xorm v0.8.2 // @grafana/alerting-squad-backend | |
| ) | |
| @@ -176,7 +176,7 @@ require ( | |
| github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect | |
| github.com/hashicorp/errwrap v1.1.0 // indirect | |
| github.com/hashicorp/go-msgpack v0.5.5 // indirect | |
| - github.com/hashicorp/go-multierror v1.1.1 // @grafana/alerting-squad | |
| + github.com/hashicorp/go-multierror v1.1.1 // indirect; @grafana/alerting-squad | |
| github.com/hashicorp/go-sockaddr v1.0.2 // indirect | |
| github.com/hashicorp/golang-lru v0.6.0 // indirect | |
| github.com/hashicorp/yamux v0.1.1 // indirect | |
| @@ -289,6 +289,8 @@ require github.com/grafana/gofpdf v0.0.0-20231002120153-857cc45be447 // @grafana | |
| require github.com/grafana/pyroscope/api v0.2.0 // @grafana/observability-traces-and-profiling | |
| +require github.com/apache/arrow/go/v13 v13.0.0 | |
| + | |
| require ( | |
| cloud.google.com/go v0.110.6 // indirect | |
| cloud.google.com/go/compute/metadata v0.2.3 // indirect | |
| @@ -299,7 +301,6 @@ require ( | |
| github.com/agext/levenshtein v1.2.1 // indirect | |
| github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect | |
| github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect | |
| - github.com/apache/arrow/go/v13 v13.0.0 // indirect | |
| github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect | |
| github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect | |
| github.com/armon/go-metrics v0.4.1 // indirect | |
| @@ -352,7 +353,6 @@ require ( | |
| github.com/inconshreveable/mousetrap v1.1.0 // indirect | |
| github.com/invopop/yaml v0.2.0 // indirect | |
| github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect | |
| - github.com/klauspost/asmfmt v1.3.2 // indirect | |
| github.com/klauspost/cpuid/v2 v2.2.4 // indirect | |
| github.com/kr/pretty v0.3.1 // indirect | |
| github.com/kr/text v0.2.0 // indirect | |
| @@ -360,8 +360,6 @@ require ( | |
| github.com/mattn/go-colorable v0.1.13 // indirect | |
| github.com/mattn/go-ieproxy v0.0.3 // indirect | |
| github.com/mattn/goveralls v0.0.6 // indirect | |
| - github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect | |
| - github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect | |
| github.com/mitchellh/copystructure v1.2.0 // indirect | |
| github.com/mitchellh/mapstructure v1.5.0 // indirect | |
| github.com/mitchellh/reflectwalk v1.0.2 // indirect | |
| diff --git a/go.sum b/go.sum | |
| index fe8c8df8d5..201dfd730e 100644 | |
| --- a/go.sum | |
| +++ b/go.sum | |
| @@ -627,7 +627,6 @@ github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0/go.mod h1:spvB9eLJH9dutlbP | |
| github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= | |
| github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= | |
| github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= | |
| -github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= | |
| github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= | |
| github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= | |
| github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= | |
| @@ -702,15 +701,11 @@ github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrG | |
| github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= | |
| github.com/apache/arrow/go/arrow v0.0.0-20210223225224-5bea62493d91/go.mod h1:c9sxoIT3YgLxH4UhLOCKaBlEojuMhVYpk4Ntv3opUTQ= | |
| github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0= | |
| -github.com/apache/arrow/go/v12 v12.0.1 h1:JsR2+hzYYjgSUkBSaahpqCetqZMr76djX80fF/DiJbg= | |
| -github.com/apache/arrow/go/v12 v12.0.1/go.mod h1:weuTY7JvTG/HDPtMQxEUp7pU73vkLWMLpY67QwZ/WWw= | |
| github.com/apache/arrow/go/v13 v13.0.0 h1:kELrvDQuKZo8csdWYqBQfyi431x6Zs/YJTEgUuSVcWk= | |
| github.com/apache/arrow/go/v13 v13.0.0/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= | |
| github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= | |
| github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= | |
| github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= | |
| -github.com/apache/thrift v0.18.1 h1:lNhK/1nqjbwbiOPDBPFJVKxgDEGSepKuTh6OLiXW8kg= | |
| -github.com/apache/thrift v0.18.1/go.mod h1:rdQn/dCcDKEWjjylUeueum4vQEjG2v8v2PqriUnbr+I= | |
| github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= | |
| github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= | |
| github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= | |
| @@ -2109,7 +2104,6 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW | |
| github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= | |
| github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= | |
| github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= | |
| -github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4= | |
| github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= | |
| github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= | |
| github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= | |
| @@ -2282,9 +2276,7 @@ github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJys | |
| github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4= | |
| github.com/miekg/dns v1.1.51 h1:0+Xg7vObnhrz/4ZCZcZh7zPXlmU0aveS2HDBd0m0qSo= | |
| github.com/miekg/dns v1.1.51/go.mod h1:2Z9d3CP1LQWihRZUf29mQ19yDThaI4DAYzte2CaQW5c= | |
| -github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs= | |
| github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= | |
| -github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI= | |
| github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= | |
| github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= | |
| github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment