Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x

This commit is contained in:
Likitha Shetty 2012-03-14 18:01:13 +05:30
commit 97d797e55c
1 changed files with 2 additions and 0 deletions

View File

@ -736,3 +736,5 @@ INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (15
INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (155, 5, 'SUSE Linux Enterprise Server 11 SP1 (32-bit)');
INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (156, 10, 'Ubuntu 10.10 (32-bit)');
INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (157, 10, 'Ubuntu 10.10 (64-bit)');
UPDATE `cloud`.`guest_os` SET category_id=4 where id=131;