Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/go_modules/develop/github.com/…
Browse files Browse the repository at this point in the history
…aws/aws-sdk-go-1.49.7
  • Loading branch information
lbeckman314 authored Dec 21, 2023
2 parents 804643d + d7b0226 commit 6ef526f
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 25 deletions.
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ require (
github.com/go-test/deep v1.1.0
github.com/golang/gddo v0.0.0-20200219175727-df439dd5819e
github.com/golang/protobuf v1.5.3
github.com/grpc-ecosystem/go-grpc-middleware v1.2.0
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/imdario/mergo v0.3.8
github.com/jlaffaye/ftp v0.2.0
Expand All @@ -46,10 +46,10 @@ require (
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/prometheus/client_golang v1.17.0
github.com/prometheus/common v0.45.0
github.com/rs/xid v1.2.1
github.com/rs/xid v1.5.0
github.com/sergi/go-diff v1.1.0 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/sirupsen/logrus v1.6.0
github.com/sirupsen/logrus v1.9.3
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
Expand All @@ -66,6 +66,6 @@ require (
gopkg.in/ini.v1 v1.51.0 // indirect
gopkg.in/olivere/elastic.v5 v5.0.84
k8s.io/api v0.28.4
k8s.io/apimachinery v0.28.4
k8s.io/apimachinery v0.29.0
k8s.io/client-go v0.28.4
)
Loading

0 comments on commit 6ef526f

Please sign in to comment.