cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject [1/2] git commit: updated refs/heads/4.2 to 7eb20b8
Date Fri, 02 Aug 2013 06:40:39 GMT
Updated Branches:
  refs/heads/4.2 2cbf97a6f -> 7eb20b850
  refs/heads/master f3dd0c600 -> 65fc2ec34


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


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

Branch: refs/heads/4.2
Commit: 7eb20b8500a002ad75f73dc01bd67dd14da6bdcf
Parents: 2cbf97a
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 11:58:48 2013 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7eb20b85/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 0d72694..7bc7193 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/7eb20b85/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 3f25c3b..de4b765 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -2221,4 +2221,6 @@ CREATE VIEW `cloud`.`account_vmstats_view` AS
         `cloud`.`vm_instance`
     where
         vm_type = 'User'
-    group by account_id , state;
\ No newline at end of file
+    group by account_id , state;
+
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Snapshots', 'DEFAULT', 'SnapshotManager',
'KVM.snapshot.enabled', 'false', 'whether snapshot is enabled for KVM hosts');
\ No newline at end of file


Mime
View raw message