Updated Branches: refs/heads/vmware-storage-motion 83f731049 -> 1a4e51f2b
Updated error message & removed stale comment Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1a4e51f2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1a4e51f2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1a4e51f2 Branch: refs/heads/vmware-storage-motion Commit: 1a4e51f2bc9f5537b1258fe8ef0affba59d3c0d9 Parents: 83f7310 Author: Sateesh Chodapuneedi <[email protected]> Authored: Wed May 29 20:13:42 2013 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Wed May 29 20:13:42 2013 +0530 ---------------------------------------------------------------------- .../hypervisor/vmware/resource/VmwareResource.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a4e51f2/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 4dc80b0..18e94bf 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -3432,7 +3432,6 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa s_logger.info("Executing resource MigrateWithStorageCommand: " + _gson.toJson(cmd)); } - //TODO(sateeshsm): Legacy zone awareness VirtualMachineTO vmTo = cmd.getVirtualMachine(); final String vmName = vmTo.getName(); @@ -3573,7 +3572,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa return new MigrateWithStorageAnswer(cmd, volumeToList); } catch (Throwable e) { if (e instanceof RemoteException) { - s_logger.warn("Encounter remote exception to vCenter, invalidate VMware session context"); + s_logger.warn("Encountered remote exception at vCenter, invalidating VMware session context"); invalidateServiceContext(); }
