Author: arkurth
Date: Wed Dec 12 20:27:50 2012
New Revision: 1420949
URL: http://svn.apache.org/viewvc?rev=1420949&view=rev
Log:
Merged revision(s) 1420947 from
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm:
VCL-656
Added 7200 second timeout to _wait_for_task call in VIM_SSH.pm when snapshots
are removed from the VM.
........
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
(contents, props changed)
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm?rev=1420949&r1=1420948&r2=1420949&view=diff
==============================================================================
---
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
(original)
+++
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
Wed Dec 12 20:27:50 2012
@@ -1785,7 +1785,7 @@ sub remove_snapshots {
}
# Wait for the task to complete
- if ($self->_wait_for_task($task_ids[0])) {
+ if ($self->_wait_for_task($task_ids[0], 7200)) {
notify($ERRORS{'OK'}, 0, "removed snapshots for VM:
$vmx_file_path");
return 1;
}
Propchange:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 12 20:27:50 2012
@@ -0,0 +1 @@
+/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm:1378995,1383454,1420869,1420947
