Skip to content

Commit

Permalink
vendor changes from kdmp master to stork master
Browse files Browse the repository at this point in the history
  • Loading branch information
@shkumari-px @lalat-das
shkumari-px authored and lalat-das committed Oct 3, 2023
1 parent 8fb30a7 commit 29f495e
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 317 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ require (
)

require (
github.com/portworx/kdmp v0.4.1-0.20230830195819-704706dda5c7
github.com/portworx/kdmp v0.4.1-0.20230927104323-84564ac8b457
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749
)

Expand Down Expand Up @@ -324,7 +324,7 @@ replace (
github.com/libopenstorage/autopilot-api => github.com/libopenstorage/autopilot-api v0.6.1-0.20210301232050-ca2633c6e114
github.com/libopenstorage/openstorage => github.com/libopenstorage/openstorage v0.0.0-20230511212757-41751b27d69f
github.com/libopenstorage/secrets => github.com/libopenstorage/secrets v0.0.0-20220413195519-57d1c446c5e9
github.com/portworx/kdmp => github.com/portworx/kdmp v0.4.1-0.20230830195819-704706dda5c7
github.com/portworx/kdmp => github.com/portworx/kdmp v0.4.1-0.20230927104323-84564ac8b457
github.com/portworx/sched-ops => github.com/portworx/sched-ops v1.20.4-rc1.0.20230922202555-69648f749f5a
github.com/portworx/torpedo => github.com/portworx/torpedo v0.0.0-20230927164041-818bdade92ff
gopkg.in/fsnotify.v1 v1.4.7 => github.com/fsnotify/fsnotify v1.4.7
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2749,8 +2749,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/polyfloyd/go-errorlint v1.0.5/go.mod h1:APVvOesVSAnne5SClsPxPdfvZTVDojXh1/G3qb5wjGI=
github.com/portworx/dcos-secrets v0.0.0-20180616013705-8e8ec3f66611/go.mod h1:4hklRW/4DQpLqkcXcjtNprbH2tz/sJaNtqinfPWl/LA=
github.com/portworx/kdmp v0.4.1-0.20230830195819-704706dda5c7 h1:SuTAPkl16RvspsGameIaW63zPqBv9i30X0Yv6NEWklM=
github.com/portworx/kdmp v0.4.1-0.20230830195819-704706dda5c7/go.mod h1:KFeJuczRm1Jw6AdejFLcXHB6yrjfKY/X1brfWDmXgr8=
github.com/portworx/kdmp v0.4.1-0.20230927104323-84564ac8b457 h1:mNaAaeHjKvm20V/4yOLspmhEtOjssWeyCf1110lRvqQ=
github.com/portworx/kdmp v0.4.1-0.20230927104323-84564ac8b457/go.mod h1:+p1H1FdhDSpjwzhAqSppzMAnd2DJjVVcnDcL2hTvwyY=
github.com/portworx/kvdb v0.0.0-20190105022415-cccaa09abfc9/go.mod h1:Q8YyrNDvPp3DVF96BDcQuaC7fAYUCuUX+l58S7OnD2M=
github.com/portworx/kvdb v0.0.0-20200723230726-2734b7f40194/go.mod h1:Q8YyrNDvPp3DVF96BDcQuaC7fAYUCuUX+l58S7OnD2M=
github.com/portworx/kvdb v0.0.0-20200929023115-b312c7519467/go.mod h1:Q8YyrNDvPp3DVF96BDcQuaC7fAYUCuUX+l58S7OnD2M=
Expand Down
30 changes: 8 additions & 22 deletions vendor/github.com/portworx/kdmp/pkg/controllers/dataexport/reconcile.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 15 additions & 28 deletions vendor/github.com/portworx/kdmp/pkg/drivers/kopiabackup/kopiabackup.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 29f495e

Please sign in to comment.