mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-19 22:44:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into merge_csi

Browse Source 
Signed-off-by: Xun Jiang/Bruce Jiang <59276555+blackpiglet@users.noreply.github.com>
This commit is contained in:
Xun Jiang/Bruce Jiang
2024-04-10 18:54:16 +08:00
committed by GitHub
parent 31e140919a b91b907f06
commit 8df4e6aded
20 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/backup_deletion_controller.go
+1 -1
View File
@@ -22,7 +22,7 @@ import (
"fmt"
"time"
jsonpatch "github.com/evanphx/json-patch"
jsonpatch "github.com/evanphx/json-patch/v5"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"