cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [44/50] git commit: updated refs/heads/4.4 to d5220a8
Date Mon, 28 Jul 2014 14:04:56 GMT
CLOUDSTACK-7029: listCapacity fails when podid argument is specified.

(cherry picked from commit ef2cf137a5b848511c546d2ce96ef1691cacb063)


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

Branch: refs/heads/4.4
Commit: 3d62fbc6e54003f499faec6f67a39ff4f830cb81
Parents: bb5ba26
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Wed Jul 9 12:07:15 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Jul 28 16:02:51 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d62fbc6/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
index bcd6fa7..df023bf 100644
--- a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
@@ -659,12 +659,12 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO,
Long> implem
         finalQuery.append(COUNT_VMS_BASED_ON_VGPU_TYPES1);
 
         if (podId != null) {
-            finalQuery.append(" AND host.pod_id = ?");
+            finalQuery.append("AND host.pod_id = ? ");
             resourceIdList.add(podId);
         }
 
         if (clusterId != null) {
-            finalQuery.append(" AND host.cluster_id = ?");
+            finalQuery.append("AND host.cluster_id = ? ");
             resourceIdList.add(clusterId);
         }
         finalQuery.append(COUNT_VMS_BASED_ON_VGPU_TYPES2);


Mime
View raw message