Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BF82F106E3 for ; Fri, 13 Dec 2013 05:13:21 +0000 (UTC) Received: (qmail 23222 invoked by uid 500); 13 Dec 2013 05:13:21 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 22992 invoked by uid 500); 13 Dec 2013 05:13:16 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 22985 invoked by uid 99); 13 Dec 2013 05:13:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Dec 2013 05:13:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AD8CD8B77F6; Fri, 13 Dec 2013 05:13:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: devdeep@apache.org To: commits@cloudstack.apache.org Message-Id: <421d45f98a0c49e78bb2cbb79817f338@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to db2b8d9 Date: Fri, 13 Dec 2013 05:13:15 +0000 (UTC) Updated Branches: refs/heads/master affe7efc8 -> db2b8d9b0 CLOUDSTACK-5311: Fix the host version reported by the hyper-v agent. Also updated the hypervisor capabilities for hyper-v. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/db2b8d9b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/db2b8d9b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/db2b8d9b Branch: refs/heads/master Commit: db2b8d9b0d61bf41fdaf838d2b9fbbadc023d1c2 Parents: affe7ef Author: Devdeep Singh Authored: Thu Dec 12 16:48:46 2013 +0530 Committer: Devdeep Singh Committed: Fri Dec 13 10:28:17 2013 +0530 ---------------------------------------------------------------------- .../ServerResource/HypervResource/HypervResourceController.cs | 1 + setup/db/db/schema-421to430.sql | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db2b8d9b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs index fe0df0f..b283d97 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs @@ -1646,6 +1646,7 @@ namespace HypervResource strtRouteCmd.storageNetmask = config.PrivateNetmask; strtRouteCmd.storageMacAddress = config.PrivateMacAddress; strtRouteCmd.gatewayIpAddress = config.GatewayIpAddress; + strtRouteCmd.hypervisorVersion = System.Environment.OSVersion.Version.ToString(); strtRouteCmd.caps = "hvm"; // Detect CPUs, speed, memory http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db2b8d9b/setup/db/db/schema-421to430.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql index 45baaaf..532a33a 100644 --- a/setup/db/db/schema-421to430.sql +++ b/setup/db/db/schema-421to430.sql @@ -828,6 +828,7 @@ CREATE TABLE `cloud`.`network_acl_item_details` ( ALTER TABLE `cloud`.`alert` ADD COLUMN `name` varchar(255) DEFAULT NULL COMMENT 'name of the alert'; UPDATE `cloud`.`hypervisor_capabilities` SET `max_data_volumes_limit`=13 WHERE `hypervisor_type`='Vmware'; +INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, storage_motion_supported) VALUES (UUID(), 'Hyperv', '6.3', 1024, 0, 64, 0); ALTER TABLE `cloud`.`external_load_balancer_devices` ADD COLUMN `is_exclusive_gslb_provider` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if load balancer appliance is acting exclusively as gslb service provider in the zone and can not be used for LB';