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/master-6-17-stable to 3faf768
Date Fri, 28 Jun 2013 05:47:40 GMT
Updated Branches:
  refs/heads/master-6-17-stable 166622f35 -> 3faf768d7


encrypt vnc_password for removed Vms also. Snapshots of removed Vms still refer Vm VOs


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

Branch: refs/heads/master-6-17-stable
Commit: 3faf768d7ef8bac0d53fc615e0b691774e7428ff
Parents: 9adec15
Author: Kishan Kavala <kishan@cloud.com>
Authored: Thu Jun 27 17:39:05 2013 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Fri Jun 28 11:04:58 2013 +0530

----------------------------------------------------------------------
 engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3faf768d/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
index 2d77429..e1b56df 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
@@ -462,7 +462,7 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade
{
         ResultSet rs = null;
         try {
         	int numRows = 0;
-        	pstmt = conn.prepareStatement("select count(id) from `cloud`.`vm_instance` where
removed is null");
+        	pstmt = conn.prepareStatement("select count(id) from `cloud`.`vm_instance`");
             rs = pstmt.executeQuery();
             if(rs.next()){
             	numRows = rs.getInt(1);
@@ -471,7 +471,7 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade
{
             pstmt.close();
             int offset = 0;
             while(offset < numRows){
-            	pstmt = conn.prepareStatement("select id, vnc_password from `cloud`.`vm_instance`
where removed is null limit "+offset+", 500");
+            	pstmt = conn.prepareStatement("select id, vnc_password from `cloud`.`vm_instance`
limit "+offset+", 500");
             	rs = pstmt.executeQuery();
             	while (rs.next()) {
             		long id = rs.getLong(1);


Mime
View raw message