Merge branch 'vmware-storage-motion' of
https://git-wip-us.apache.org/repos/asf/cloudstack into vmware-storage-motion
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/985435d3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/985435d3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/985435d3
Branch: refs/heads/vmware-storage-motion
Commit: 985435d37ec486ec018d4a866ce58a3a13bb0b0a
Parents: f0b1fa1 202b103
Author: Sateesh Chodapuneedi <[email protected]>
Authored: Sat May 25 08:48:56 2013 +0530
Committer: Sateesh Chodapuneedi <[email protected]>
Committed: Sat May 25 08:48:56 2013 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
