----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/29845/#review67830 -----------------------------------------------------------
Ship it! d79837b67a481e618c8291152a9ecec299ff02dd master doesn't apply on 4.5 Applying: CLOUDSTACK-8152: Adding delay before creating snapshot/template from root disk after writing data to disk - test_vm_passwordenabled.py Using index info to reconstruct a base tree... M test/integration/component/test_vm_passwdenabled.py Falling back to patching base and 3-way merge... Auto-merging test/integration/component/test_vm_passwdenabled.py CONFLICT (content): Merge conflict in test/integration/component/test_vm_passwdenabled.py Failed to merge in the changes. Patch failed at 0001 CLOUDSTACK-8152: Adding delay before creating snapshot/template from root disk after writing data to disk - test_vm_passwordenabled.py The copy of the patch that failed is found in: /Users/talluri/asf/cloudstack/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". - SrikanteswaraRao Talluri On Jan. 13, 2015, 8:31 a.m., Gaurav Aradhye wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/29845/ > ----------------------------------------------------------- > > (Updated Jan. 13, 2015, 8:31 a.m.) > > > Review request for cloudstack and SrikanteswaraRao Talluri. > > > Bugs: CLOUDSTACK-8152 > https://issues.apache.org/jira/browse/CLOUDSTACK-8152 > > > Repository: cloudstack-git > > > Description > ------- > > Due to timing issue, sometimes data gets lost if snapshot/template is created > from root volume immediately after writing data to disk. Add delay to bypass > this issue. > > > Diffs > ----- > > test/integration/component/test_vm_passwdenabled.py d998ed5 > > Diff: https://reviews.apache.org/r/29845/diff/ > > > Testing > ------- > > Test get VM password for password enabled template ... === TestName: > test_11_get_vm_password | Status : SUCCESS === > ok > > ---------------------------------------------------------------------- > Ran 1 test in 751.495s > > OK > > > Thanks, > > Gaurav Aradhye > >
