jmsperu commented on PR #12898: URL: https://github.com/apache/cloudstack/pull/12898#issuecomment-5601565306
Synced with 4.22 again (a39a95d). One conflict, in `LibvirtRestoreBackupCommandWrapperTest`: both sides added new test methods in the same place (the LUKS restore tests here, the attach-device tests from #14007 upstream), so both are kept. The wrapper itself merged cleanly and now carries upstream's restore-and-attach fix alongside the encrypted-restore path. Verified on JDK 17: `LibvirtRestoreBackupCommandWrapperTest` 19/19, `LibvirtTakeBackupCommandWrapperTest` 5/5, `NASBackupProviderTest` 15/15, `bash -n nasbackup.sh` clean. Ready for a package and test run. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
