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 448AFFD19 for ; Thu, 4 Apr 2013 16:35:22 +0000 (UTC) Received: (qmail 76507 invoked by uid 500); 4 Apr 2013 16:35:21 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 76326 invoked by uid 500); 4 Apr 2013 16:35:21 -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 76295 invoked by uid 99); 4 Apr 2013 16:35:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Apr 2013 16:35:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3075A837A05; Thu, 4 Apr 2013 16:35:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chipchilders@apache.org To: commits@cloudstack.apache.org Message-Id: <394669ea66fd4ac3820f965c94d2ec4f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.1 to 0167420 Date: Thu, 4 Apr 2013 16:35:20 +0000 (UTC) Updated Branches: refs/heads/4.1 0c38d6781 -> 016742011 CLOUDSTACK-1842: adding the missing os type in upgrade script Signed-off-by: Chip Childers Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/01674201 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/01674201 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/01674201 Branch: refs/heads/4.1 Commit: 016742011e6c7c7da4313d4c31f6435e28680e34 Parents: 0c38d67 Author: Chip Childers Authored: Thu Apr 4 17:34:27 2013 +0100 Committer: Chip Childers Committed: Thu Apr 4 17:34:27 2013 +0100 ---------------------------------------------------------------------- setup/db/db/schema-40to410.sql | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/01674201/setup/db/db/schema-40to410.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql index 5fe7127..018406b 100644 --- a/setup/db/db/schema-40to410.sql +++ b/setup/db/db/schema-40to410.sql @@ -1685,3 +1685,7 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'manage INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Usage', 'DEFAULT', 'management-server', 'traffic.sentinel.exclude.zones' , '', 'Traffic going into specified list of zones is not metered'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Usage', 'DEFAULT', 'management-server', 'traffic.sentinel.include.zones' , 'EXTERNAL', 'Traffic going into specified list of zones is metered. For metering all traffic leave this parameter empty'); + + +INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (163, UUID(), 10, 'Ubuntu 12.04 (32-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (164, UUID(), 10, 'Ubuntu 12.04 (64-bit)');