Updated Branches: refs/heads/4.1 0ef3e6dd5 -> 7b3e2a72f
Revert "bug CLOUDSTACK-1842: adding the missing os type in upgrade script" This reverts commit f1c7f4022a406098ad23424d381d924f185ba456. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7b3e2a72 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7b3e2a72 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7b3e2a72 Branch: refs/heads/4.1 Commit: 7b3e2a72f13d8a1d36e6e97311d569ca11ee7548 Parents: 0ef3e6d Author: Chip Childers <[email protected]> Authored: Thu Apr 4 14:59:00 2013 +0100 Committer: Chip Childers <[email protected]> Committed: Thu Apr 4 14:59:00 2013 +0100 ---------------------------------------------------------------------- setup/db/db/schema-40to410.sql | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b3e2a72/setup/db/db/schema-40to410.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql index 8c70c6a..5fe7127 100644 --- a/setup/db/db/schema-40to410.sql +++ b/setup/db/db/schema-40to410.sql @@ -1685,7 +1685,3 @@ 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)');
