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

This commit is contained in:
Koushik Das 2012-08-17 18:51:09 +05:30
commit 1711a36a84
1 changed files with 1 additions and 1 deletions

View File

@ -2443,7 +2443,7 @@ CREATE TABLE `cloud`.`autoscale_policy_condition_map` (
PRIMARY KEY (`id`),
CONSTRAINT `fk_autoscale_policy_condition_map__policy_id` FOREIGN KEY `fk_autoscale_policy_condition_map__policy_id` (`policy_id`) REFERENCES `autoscale_policies` (`id`) ON DELETE CASCADE,
CONSTRAINT `fk_autoscale_policy_condition_map__condition_id` FOREIGN KEY `fk_autoscale_policy_condition_map__condition_id` (`condition_id`) REFERENCES `conditions` (`id`),
INDEX `i_autoscale_policy_condition_map__policy_id`(`policy_id`),
INDEX `i_autoscale_policy_condition_map__policy_id`(`policy_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `cloud`.`autoscale_vmgroup_policy_map` (