Merge branch 'vmware-datamodel' of
https://git-wip-us.apache.org/repos/asf/cloudstack into vmware-datamodel
Conflicts:
engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDao.java
plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java
plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d07f8754
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d07f8754
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d07f8754
Branch: refs/heads/vmware-datamodel
Commit: d07f8754820967e2a746eb51f40199ce28a37252
Parents: ac848e4 57444fc
Author: Sateesh Chodapuneedi <[email protected]>
Authored: Sun May 19 17:33:56 2013 +0530
Committer: Sateesh Chodapuneedi <[email protected]>
Committed: Sun May 19 17:33:56 2013 +0530
----------------------------------------------------------------------
setup/db/db/schema-410to420.sql | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d07f8754/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
