Skip to content

Merge https://github.com/openshift/oadp-operator:oadp-1.3 (059bc65) into oadp-1.3 #2298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weshayutin merged 1 commit into from
Jul 14, 2026
+4 −4
Merged

Merge https://github.com/openshift/oadp-operator:oadp-1.3 (059bc65) into oadp-1.3 #2298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openshift/oadp-operator

go 1.25.0
go 1.25.8

require (
github.com/aws/aws-sdk-go v1.44.253
Expand Down Expand Up @@ -185,7 +185,7 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)

replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20260707184635-e3ed032b0b82
replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20260713192235-49b763b1d6f3

exclude github.com/kcp-dev/kcp/sdk v0.0.0-00010101000000-000000000000

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,8 +744,8 @@ github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ=
github.com/openshift/api v0.0.0-20230213134911-7ba313770556 h1:7W2fOhJicyEff24VaF7ASNzPtYvr+iSCVft4SIBAzaE=
github.com/openshift/api v0.0.0-20230213134911-7ba313770556/go.mod h1:aQ6LDasvHMvHZXqLHnX2GRmnfTWCF/iIwz8EMTTIE9A=
github.com/openshift/velero v0.10.2-0.20260707184635-e3ed032b0b82 h1:EuFIJkajn36wu6xkfgbuOEH9vFPR4ETt59D+2Yx8eh8=
github.com/openshift/velero v0.10.2-0.20260707184635-e3ed032b0b82/go.mod h1:Sy+Pw7/lIGH/H+2KtA+hkxH5Z5TwzwRqukymuzQAo00=
github.com/openshift/velero v0.10.2-0.20260713192235-49b763b1d6f3 h1:6FZd5zfDn9z/lq9drBE6dPfcklI2oiu3K7RuxbfyggQ=
github.com/openshift/velero v0.10.2-0.20260713192235-49b763b1d6f3/go.mod h1:Sy+Pw7/lIGH/H+2KtA+hkxH5Z5TwzwRqukymuzQAo00=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/operator-framework/api v0.10.0/go.mod h1:tV0BUNvly7szq28ZPBXhjp1Sqg5yHCOeX19ui9K4vjI=
github.com/operator-framework/api v0.10.7 h1:GlZJ6m+0WSVdSsSjTbhKKAvHXamWJXhwXHUhVwL8LBE=
Expand Down
Loading