forked from vmware-tanzu/velero-plugin-for-csi
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resolve conflict with PR vmware-tanzu#180
plugin workflow determines whether to restore depends on PVC has the VolumeSnapshot annotation, so change to check the annotation from the pvcFromBackup, not the modified pvc. Signed-off-by: Xun Jiang <[email protected]>
- Loading branch information
Xun Jiang
committed
Jul 19, 2023
1 parent
77ee0b4
commit 6a5a13e
Showing
3 changed files
with
4 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -48,4 +48,5 @@ site/vendor | |
|
||
.vs | ||
|
||
_tiltbuild | ||
_tiltbuild | ||
coverage.out |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters