Skip to content

Commit e7b1658

Browse files
committed
Merge branch 'main' of github.com:dragonflyoss/dragonfly into release-2.2
2 parents dd31181 + 75083be commit e7b1658

File tree

18 files changed

+677
-205
lines changed

18 files changed

+677
-205
lines changed

go.mod

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/docker/docker v28.1.1+incompatible
2424
github.com/docker/go-connections v0.5.0
2525
github.com/docker/go-units v0.4.0
26-
github.com/dragonflyoss/machinery v1.10.10
26+
github.com/dragonflyoss/machinery v1.10.13
2727
github.com/elastic/go-freelru v0.16.0
2828
github.com/fsouza/fake-gcs-server v1.52.2
2929
github.com/gaius-qi/ping v1.0.0
@@ -37,8 +37,8 @@ require (
3737
github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a
3838
github.com/go-playground/validator/v10 v10.26.0
3939
github.com/go-redis/cache/v9 v9.0.0
40+
github.com/go-redis/redis_rate/v10 v10.0.1
4041
github.com/go-redis/redismock/v9 v9.2.0
41-
github.com/go-redsync/redsync/v4 v4.13.0
4242
github.com/go-sql-driver/mysql v1.9.2
4343
github.com/gofrs/flock v0.8.1
4444
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
@@ -57,7 +57,6 @@ require (
5757
github.com/looplab/fsm v1.0.2
5858
github.com/mcuadros/go-gin-prometheus v0.1.0
5959
github.com/mdlayher/vsock v1.2.1
60-
github.com/mennanov/limiters v1.11.0
6160
github.com/mitchellh/mapstructure v1.5.0
6261
github.com/montanaflynn/stats v0.7.1
6362
github.com/onsi/ginkgo/v2 v2.23.4
@@ -123,30 +122,17 @@ require (
123122
github.com/KyleBanks/depth v1.2.1 // indirect
124123
github.com/Microsoft/hcsshim v0.9.12 // indirect
125124
github.com/RichardKnop/logging v0.0.0-20190827224416-1a693bdd4fae // indirect
126-
github.com/alessandro-c/gomemcached-lock v1.0.0 // indirect
127125
github.com/armon/go-metrics v0.4.1 // indirect
128-
github.com/aws/aws-sdk-go-v2 v1.32.5 // indirect
129-
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.17 // indirect
130-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.24 // indirect
131-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.24 // indirect
132-
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.37.1 // indirect
133-
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.6 // indirect
134-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
135-
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.5 // indirect
136-
github.com/aws/smithy-go v1.22.1 // indirect
137126
github.com/beorn7/perks v1.0.1 // indirect
138127
github.com/blang/semver/v4 v4.0.0 // indirect
139128
github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
140129
github.com/bytedance/sonic v1.13.2 // indirect
141130
github.com/bytedance/sonic/loader v0.2.4 // indirect
142131
github.com/casbin/govaluate v1.1.0 // indirect
143-
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
144132
github.com/cloudwego/base64x v0.1.5 // indirect
145133
github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 // indirect
146134
github.com/containerd/errdefs v0.1.0 // indirect
147135
github.com/containerd/log v0.1.0 // indirect
148-
github.com/coreos/go-semver v0.3.1 // indirect
149-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
150136
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
151137
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
152138
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -155,7 +141,6 @@ require (
155141
github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 // indirect
156142
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
157143
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
158-
github.com/fatih/color v1.16.0 // indirect
159144
github.com/felixge/httpsnoop v1.0.4 // indirect
160145
github.com/fsnotify/fsnotify v1.7.0 // indirect
161146
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
@@ -170,9 +155,9 @@ require (
170155
github.com/go-openapi/swag v0.23.0 // indirect
171156
github.com/go-playground/locales v0.14.1 // indirect
172157
github.com/go-playground/universal-translator v0.18.1 // indirect
158+
github.com/go-redsync/redsync/v4 v4.13.0 // indirect
173159
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
174160
github.com/goccy/go-json v0.10.5 // indirect
175-
github.com/gogo/protobuf v1.3.2 // indirect
176161
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
177162
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
178163
github.com/golang-sql/sqlexp v0.1.0 // indirect
@@ -188,19 +173,14 @@ require (
188173
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
189174
github.com/gorilla/handlers v1.5.2 // indirect
190175
github.com/gorilla/mux v1.8.1 // indirect
191-
github.com/hashicorp/consul/api v1.30.0 // indirect
192176
github.com/hashicorp/errwrap v1.1.0 // indirect
193-
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
194-
github.com/hashicorp/go-hclog v1.5.0 // indirect
195177
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
196178
github.com/hashicorp/go-metrics v0.5.4 // indirect
197179
github.com/hashicorp/go-msgpack/v2 v2.1.1 // indirect
198-
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
199180
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
200181
github.com/hashicorp/go-uuid v1.0.3 // indirect
201182
github.com/hashicorp/golang-lru v0.5.4 // indirect
202183
github.com/hashicorp/hcl v1.0.0 // indirect
203-
github.com/hashicorp/serf v0.10.1 // indirect
204184
github.com/inconshreveable/mousetrap v1.1.0 // indirect
205185
github.com/jackc/pgpassfile v1.0.0 // indirect
206186
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
@@ -225,14 +205,12 @@ require (
225205
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
226206
github.com/magiconair/properties v1.8.7 // indirect
227207
github.com/mailru/easyjson v0.7.7 // indirect
228-
github.com/mattn/go-colorable v0.1.13 // indirect
229208
github.com/mattn/go-isatty v0.0.20 // indirect
230209
github.com/mattn/go-sqlite3 v1.14.15 // indirect
231210
github.com/mdlayher/socket v0.4.1 // indirect
232211
github.com/microsoft/go-mssqldb v0.17.0 // indirect
233212
github.com/miekg/dns v1.1.41 // indirect
234213
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
235-
github.com/mitchellh/go-homedir v1.1.0 // indirect
236214
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
237215
github.com/modern-go/reflect2 v1.0.2 // indirect
238216
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -253,7 +231,6 @@ require (
253231
github.com/russross/blackfriday/v2 v2.1.0 // indirect
254232
github.com/sagikazarmark/locafero v0.4.0 // indirect
255233
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
256-
github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414 // indirect
257234
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
258235
github.com/shoenig/go-m1cpu v0.1.6 // indirect
259236
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -262,7 +239,6 @@ require (
262239
github.com/spf13/cast v1.6.0 // indirect
263240
github.com/spf13/pflag v1.0.6 // indirect
264241
github.com/subosito/gotenv v1.6.0 // indirect
265-
github.com/thanhpk/randstr v1.0.4 // indirect
266242
github.com/tklauser/go-sysconf v0.3.12 // indirect
267243
github.com/tklauser/numcpus v0.6.1 // indirect
268244
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -275,9 +251,6 @@ require (
275251
github.com/xdg-go/stringprep v1.0.4 // indirect
276252
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
277253
github.com/yusufpapurcu/wmi v1.2.4 // indirect
278-
go.etcd.io/etcd/api/v3 v3.5.17 // indirect
279-
go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect
280-
go.etcd.io/etcd/client/v3 v3.5.17 // indirect
281254
go.mongodb.org/mongo-driver v1.17.0 // indirect
282255
go.opencensus.io v0.24.0 // indirect
283256
go.opentelemetry.io/auto/sdk v1.1.0 // indirect

0 commit comments

Comments
 (0)