Skip to content

Merge https://github.com/openshift/oadp-operator:oadp-dev (5048a8f) into oadp-dev #2015

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
merged 1 commit into from
Nov 8, 2025
+3 −3
Merged

Merge https://github.com/openshift/oadp-operator:oadp-dev (5048a8f) into oadp-dev #2015

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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,6 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20251104165357-37b2d9ec3f2a
replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20251106190541-0cdd4cfab50d

replace github.com/kopia/kopia => github.com/migtools/kopia v0.0.0-20250814081930-848859b500ac
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 @@ -756,8 +756,8 @@ github.com/openshift/api v0.0.0-20240524162738-d899f8877d22 h1:AW8KUN4k7qR2egrCC
github.com/openshift/api v0.0.0-20240524162738-d899f8877d22/go.mod h1:7Hm1kLJGxWT6eysOpD2zUztdn+w91eiERn6KtI5o9aw=
github.com/openshift/hypershift/api v0.0.0-20241128081537-8326d865eaf5 h1:z8AkPjlJ/CPqED/EPtlgQKYEt8+Edc30ZR8eQWOEigA=
github.com/openshift/hypershift/api v0.0.0-20241128081537-8326d865eaf5/go.mod h1:3UlUlywmXBCEMF3GACTvMAOvv2lU5qzUDvTYFXeGbKU=
github.com/openshift/velero v0.10.2-0.20251104165357-37b2d9ec3f2a h1:LRjh0JV00Nmjpp4jPHOn6IKgpPR2U+nPoqhJU2ByFRE=
github.com/openshift/velero v0.10.2-0.20251104165357-37b2d9ec3f2a/go.mod h1:siVJMfpO/iw1mX0wAiAJ8m4uKRzXtiA0eXNQPZIZYmI=
github.com/openshift/velero v0.10.2-0.20251106190541-0cdd4cfab50d h1:GTyeMx/QNuS8FFErRdYWypljOsWpdX/SKd7GOaRMOPQ=
github.com/openshift/velero v0.10.2-0.20251106190541-0cdd4cfab50d/go.mod h1:siVJMfpO/iw1mX0wAiAJ8m4uKRzXtiA0eXNQPZIZYmI=
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