You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/29 21:48:25 UTC
git commit: updated refs/heads/4.4 to 6aef8bd
Repository: cloudstack
Updated Branches:
refs/heads/4.4 8db1b21cc -> 6aef8bd90
CLOUDSTACK-7005 - Failed to start MS with latest 4.4 RPM builds
(cherry picked from commit f7417d622a15c9ff6a5d6e5e7284bd220bc647ee)
Conflicts:
setup/db/db/schema-430to440.sql
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6aef8bd9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6aef8bd9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6aef8bd9
Branch: refs/heads/4.4
Commit: 6aef8bd906440b82c0d57d5f08d55421b74f0c6d
Parents: 8db1b21
Author: Ian Duffy <ia...@ianduffy.ie>
Authored: Sun Jun 29 18:58:07 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Jun 29 21:48:07 2014 +0200
----------------------------------------------------------------------
setup/db/db/schema-430to440.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6aef8bd9/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 0fd8c55..cd4ba36 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -2439,4 +2439,4 @@ CREATE TABLE `cloud`.`load_balancer_healthcheck_policy_details` (
CONSTRAINT `fk_lb_healthcheck_policy_details__lb_healthcheck_policy_id` FOREIGN KEY `fk_lb_healthcheck_policy_details__lb_healthcheck_policy_id`(`lb_policy_id`) REFERENCES `load_balancer_healthcheck_policies`(`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-INSERT INTO `cloud`.`configuration`(category, instance, component, name, value, description, default_value) VALUES ('Secure', 'DEFAULT', 'management-server', 'vm.password.length', '6', 'Specifies the length of a randomly generated password', '6') ON DUPLICATE KEY UPDATE category='Secure';
+INSERT INTO `cloud`.`configuration`(category, instance, component, name, value, description, default_value) VALUES ('Advanced', 'DEFAULT', 'management-server', 'vm.password.length', '6', 'Specifies the length of a randomly generated password', '6') ON DUPLICATE KEY UPDATE category='Advanced';