Updated Branches: refs/heads/vmware-datamodel d07f87548 -> 8b9f598a0
Minor fixes, removed duplicate entry for a column in schema-410-420. Renamed a method. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8b9f598a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8b9f598a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8b9f598a Branch: refs/heads/vmware-datamodel Commit: 8b9f598a0ff477cf82092cd17a6a53e115ccb9d9 Parents: d07f875 Author: Sateesh Chodapuneedi <[email protected]> Authored: Wed May 22 07:10:27 2013 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Wed May 22 07:10:27 2013 +0530 ---------------------------------------------------------------------- .../vmware/VmwareDatacenterZoneMapVO.java | 2 +- setup/db/db/schema-410to420.sql | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b9f598a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java index df1062b..4e2cbe9 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java @@ -71,7 +71,7 @@ public class VmwareDatacenterZoneMapVO implements VmwareDatacenterZoneMap { this.zoneId = zoneId; } - public void setVsmId(long vmwareDcId) { + public void setVmwareDcId(long vmwareDcId) { this.vmwareDcId = vmwareDcId; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b9f598a/setup/db/db/schema-410to420.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index 12d50af..a401e75 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -1117,7 +1117,6 @@ CREATE VIEW `cloud`.`account_view` AS select account.id, account.uuid, - account.uuid, account.account_name, account.type, account.state,
