You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by du...@apache.org on 2014/07/20 19:36:52 UTC
[3/3] git commit: updated refs/heads/master to b6a1d11
CLOUDSTACK-7005 - Failed to start MS with latest 4.4 RPM builds
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/b6a1d11c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b6a1d11c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b6a1d11c
Branch: refs/heads/master
Commit: b6a1d11c90b7f3ea7eb8bebb812db665cf33b094
Parents: 8716376
Author: Ian Duffy <ia...@ianduffy.ie>
Authored: Sun Jun 29 18:58:07 2014 +0100
Committer: Ian Duffy <ia...@ianduffy.ie>
Committed: Sun Jul 20 18:17:28 2014 +0100
----------------------------------------------------------------------
setup/db/db/schema-430to440.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6a1d11c/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index fdf7300..a99ec28 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -2495,4 +2495,4 @@ CREATE TABLE `cloud`.`snapshot_policy_details` (
CONSTRAINT `fk_snapshot_policy_details__snapshot_policy_id` FOREIGN KEY `fk_snapshot_policy_details__snapshot_policy_id`(`policy_id`) REFERENCES `snapshot_policy`(`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';