Merge branch 'vmware-storage-motion' of
https://git-wip-us.apache.org/repos/asf/cloudstack into vmware-storage-motion
Conflicts:
setup/db/db/schema-410to420.sql
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/202b1036
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/202b1036
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/202b1036
Branch: refs/heads/vmware-storage-motion
Commit: 202b10368134152946b8855521557d0f81631b84
Parents: 6fcc94f b3337df
Author: Sateesh Chodapuneedi <[email protected]>
Authored: Fri May 24 21:56:09 2013 +0530
Committer: Sateesh Chodapuneedi <[email protected]>
Committed: Fri May 24 21:56:09 2013 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
