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 EED82F29D for ; Thu, 4 Apr 2013 05:51:02 +0000 (UTC) Received: (qmail 87571 invoked by uid 500); 4 Apr 2013 05:51:02 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 87527 invoked by uid 500); 4 Apr 2013 05:51:01 -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 87511 invoked by uid 99); 4 Apr 2013 05:51:01 -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 05:51:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 747D1837692; Thu, 4 Apr 2013 05:51:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aprateek@apache.org To: commits@cloudstack.apache.org Message-Id: <5bf47b9e6ece429387d3877597d334c4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.1 to f1c7f40 Date: Thu, 4 Apr 2013 05:51:00 +0000 (UTC) Updated Branches: refs/heads/4.1 489010123 -> f1c7f4022 bug CLOUDSTACK-1842: adding the missing os type in upgrade script Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f1c7f402 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f1c7f402 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f1c7f402 Branch: refs/heads/4.1 Commit: f1c7f4022a406098ad23424d381d924f185ba456 Parents: 4890101 Author: Abhinandan Prateek Authored: Thu Apr 4 11:15:59 2013 +0530 Committer: Abhinandan Prateek Committed: Thu Apr 4 11:15:59 2013 +0530 ---------------------------------------------------------------------- setup/db/db/schema-40to410.sql | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1c7f402/setup/db/db/schema-40to410.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql index 5fe7127..8c70c6a 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 INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (163, UUID(), 10, 'Ubuntu 12.04 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (164, UUID(), 10, 'Ubuntu 12.04 (64-bit)');