Skip to content

Commit 7b4eaa0

Browse files
committed
Merge remote-tracking branch 'origin/main' into dev/SERVER-216
2 parents 36a7b32 + 490f5cd commit 7b4eaa0

File tree

2 files changed

+68
-69
lines changed

2 files changed

+68
-69
lines changed

go.mod

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ go 1.23.12
55
toolchain go1.24.5
66

77
require (
8-
github.com/aerospike/aerospike-client-go/v8 v8.2.2
8+
github.com/aerospike/aerospike-client-go/v8 v8.4.0
99
github.com/aerospike/aerospike-management-lib v1.8.0
1010
github.com/aerospike/tools-common-go v0.3.0
1111
github.com/bombsimon/logrusr/v4 v4.1.0
12-
github.com/docker/docker v28.3.2+incompatible
12+
github.com/docker/docker v28.5.1+incompatible
1313
github.com/go-logr/logr v1.4.3
1414
github.com/opencontainers/image-spec v1.1.1
1515
github.com/sirupsen/logrus v1.9.3
16-
github.com/spf13/cobra v1.9.1
17-
github.com/spf13/pflag v1.0.6
18-
github.com/stretchr/testify v1.10.0
16+
github.com/spf13/cobra v1.10.1
17+
github.com/spf13/pflag v1.0.10
18+
github.com/stretchr/testify v1.11.1
1919
gopkg.in/yaml.v3 v3.0.1
2020
)
2121

@@ -31,22 +31,22 @@ require (
3131
github.com/docker/go-connections v0.5.0 // indirect
3232
github.com/docker/go-units v0.5.0 // indirect
3333
github.com/felixge/httpsnoop v1.0.4 // indirect
34-
github.com/fsnotify/fsnotify v1.8.0 // indirect
34+
github.com/fsnotify/fsnotify v1.9.0 // indirect
3535
github.com/go-logr/stdr v1.2.2 // indirect
36-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
36+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
3737
github.com/gogo/protobuf v1.3.2 // indirect
3838
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3939
github.com/moby/docker-image-spec v1.3.1 // indirect
4040
github.com/moby/sys/sequential v0.6.0 // indirect
4141
github.com/opencontainers/go-digest v1.0.0 // indirect
42-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
42+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
4343
github.com/pkg/errors v0.9.1 // indirect
4444
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
45-
github.com/sagikazarmark/locafero v0.7.0 // indirect
46-
github.com/sourcegraph/conc v0.3.0 // indirect
47-
github.com/spf13/afero v1.12.0 // indirect
48-
github.com/spf13/cast v1.7.1 // indirect
49-
github.com/spf13/viper v1.20.1 // indirect
45+
github.com/sagikazarmark/locafero v0.11.0 // indirect
46+
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
47+
github.com/spf13/afero v1.15.0 // indirect
48+
github.com/spf13/cast v1.10.0 // indirect
49+
github.com/spf13/viper v1.21.0 // indirect
5050
github.com/subosito/gotenv v1.6.0 // indirect
5151
github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad // indirect
5252
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
@@ -58,13 +58,14 @@ require (
5858
go.opentelemetry.io/otel v1.37.0 // indirect
5959
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect
6060
go.opentelemetry.io/otel/metric v1.37.0 // indirect
61+
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
6162
go.opentelemetry.io/otel/trace v1.37.0 // indirect
6263
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
63-
go.uber.org/multierr v1.11.0 // indirect
64-
golang.org/x/sync v0.12.0 // indirect
65-
golang.org/x/sys v0.31.0 // indirect
66-
golang.org/x/text v0.23.0 // indirect
67-
golang.org/x/tools v0.31.0 // indirect
64+
go.yaml.in/yaml/v3 v3.0.4 // indirect
65+
golang.org/x/sync v0.16.0 // indirect
66+
golang.org/x/sys v0.34.0 // indirect
67+
golang.org/x/text v0.28.0 // indirect
68+
golang.org/x/tools v0.35.0 // indirect
6869
gopkg.in/inf.v0 v0.9.1 // indirect
6970
k8s.io/apimachinery v0.29.0 // indirect
7071
)

0 commit comments

Comments
 (0)