cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/master to 0eafc0c
Date Tue, 06 Aug 2013 05:20:51 GMT
Updated Branches:
  refs/heads/master cfac58493 -> 0eafc0c0d


CLOUDSTACK-4064: Missed renaming the config for KVM snapshots

KVM.snapshot.enabled is lowercased by f025db95 to keep the configs
uniformly lower-case. But it missed the upgrade script and the
references in SnapshotManagerImpl. This commit will fix the issue in all
locations

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 0e216fa7e41bdfe0cc744006bb896c8b00138ca2)


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

Branch: refs/heads/master
Commit: 0eafc0c0d82c5599d21e1ca163f7822ae94c4e14
Parents: cfac584
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Tue Aug 6 10:37:48 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Tue Aug 6 10:39:14 2013 +0530

----------------------------------------------------------------------
 engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java   | 2 +-
 server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0eafc0c0/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index 01cc6f4..c87547b 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -318,7 +318,7 @@ public class Upgrade410to420 implements DbUpgrade {
             pstmt.close();
             if (numRows > 0){
               //Add the configuration flag
-                pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value =
? WHERE name = 'KVM.snapshot.enabled'");
+                pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value =
? WHERE name = 'kvm.snapshot.enabled'");
                 pstmt.setString(1, "true");
                 pstmt.executeUpdate();
             }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0eafc0c0/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index 935bfaa..8c6249b 100755
--- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -910,7 +910,7 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager,
 		}
 
         //Turn off snapshot by default for KVM, unless it is set in the global flag
-        boolean snapshotEnabled = Boolean.parseBoolean(_configDao.getValue("KVM.snapshot.enabled"));
+        boolean snapshotEnabled = Boolean.parseBoolean(_configDao.getValue("kvm.snapshot.enabled"));
         if (!snapshotEnabled) {
              return false;
         }


Mime
View raw message