cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [01/50] [abbrv] git commit: updated refs/heads/disk-cache to 99d67cb
Date Mon, 02 Sep 2013 20:04:47 GMT
Updated Branches:
  refs/heads/4.2 821373f4f -> 66beddf33
  refs/heads/4.2-forward 569594f96 -> 8c3986df8
  refs/heads/disk-cache 61821d6de -> 99d67cb4c
  refs/heads/master a16fd4781 -> a7f861f8d


CLOUDSTACK-4032: Added KVM.snapshot.enabled config to 41to42 upgrade

Conflicts:
	setup/db/db/schema-410to420.sql


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/65fc2ec3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/65fc2ec3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/65fc2ec3

Branch: refs/heads/disk-cache
Commit: 65fc2ec345e65d18581dd566c1bf605dc004795c
Parents: f3dd0c6
Author: Kishan Kavala <kishan@cloud.com>
Authored: Fri Aug 2 11:58:48 2013 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Fri Aug 2 12:04:33 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/configuration/Config.java | 4 +++-
 setup/db/db/schema-410to420.sql                | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65fc2ec3/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index c2b1346..1d1624b 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -572,7 +572,9 @@ public enum Config {
             return "TemplateManager";
         } else if (_componentClass == VpcManager.class) {
             return "VpcManager";
-        }else {
+        } else if (_componentClass == SnapshotManager.class) {
+            return "SnapshotManager";
+        } else {
             return "none";
         }
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65fc2ec3/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 99a0208..6aa1222 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -2220,3 +2220,5 @@ CREATE TABLE `cloud_usage`.`usage_vmsnapshot` (
 ) ENGINE=InnoDB CHARSET=utf8;
 
 ALTER TABLE volumes ADD COLUMN vm_snapshot_chain_size bigint(20) unsigned;
+
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Snapshots', 'DEFAULT', 'SnapshotManager',
'KVM.snapshot.enabled', 'false', 'whether snapshot is enabled for KVM hosts');


Mime
View raw message