Merge branch 'vmware-storage-motion' of
https://git-wip-us.apache.org/repos/asf/cloudstack into vmware-storage-motion
Conflicts:
vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/004e74de
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/004e74de
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/004e74de
Branch: refs/heads/vmware-storage-motion
Commit: 004e74de105e339457be26e4a33bf8efe26a6428
Parents: 1b66e96 07d5271
Author: Sateesh Chodapuneedi <sate...@apache.org>
Authored: Wed May 29 15:21:00 2013 +0530
Committer: Sateesh Chodapuneedi <sate...@apache.org>
Committed: Wed May 29 15:21:00 2013 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
