cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/4.4 to d3e0ecd
Date Wed, 30 Jul 2014 11:38:44 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 865cdc08e -> d3e0ecd13


CLOUDSTACK-6358: KVM mappings for CentOS 6.x and RHEL 6.x

(cherry picked from commit c8ca15b95a57a3d79b71c76c913e295f6490f05d)

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/d3e0ecd1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d3e0ecd1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d3e0ecd1

Branch: refs/heads/4.4
Commit: d3e0ecd130dbdd196e71be1eb32f92d4be6fdd2e
Parents: 865cdc0
Author: amoghvk <amogh.vasekar@citrix.com>
Authored: Thu Jul 17 14:16:35 2014 -0700
Committer: Daan Hoogland <daan@onecht.net>
Committed: Wed Jul 30 13:38:26 2014 +0200

----------------------------------------------------------------------
 setup/db/db/schema-430to440.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d3e0ecd1/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 1c8142f..69bb496 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -2474,8 +2474,6 @@ CREATE TABLE `cloud`.`load_balancer_healthcheck_policy_details` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
-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';
-
 ALTER TABLE `cloud`.`snapshot_policy` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1'
COMMENT 'True if the policy can be displayed to the end user';
 
 CREATE TABLE `cloud`.`snapshot_policy_details` (
@@ -2487,3 +2485,5 @@ CREATE TABLE `cloud`.`snapshot_policy_details` (
   PRIMARY KEY (`id`),
   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 ('Advanced', 'DEFAULT', 'management-server', 'vm.password.length', '6',
'Specifies the length of a randomly generated password', '6') ON DUPLICATE KEY UPDATE category='Advanced';


Mime
View raw message