You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/06/23 14:53:30 UTC

git commit: updated refs/heads/master to 82ecc1a

Repository: cloudstack
Updated Branches:
  refs/heads/master 66d51c91e -> 82ecc1aa0


CLOUDSTACK-8578: fix listVirtualMachines does not return deleted machines when zone is specified

Signed-off-by: Daan Hoogland <da...@gmail.com>

This closes #510


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

Branch: refs/heads/master
Commit: 82ecc1aa06e75bb15fe5d0bd8628f7acc6b61623
Parents: 66d51c9
Author: Rene Moser <re...@apache.org>
Authored: Tue Jun 23 10:17:25 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Tue Jun 23 14:53:08 2015 +0200

----------------------------------------------------------------------
 server/src/com/cloud/api/query/QueryManagerImpl.java | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/82ecc1aa/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 8179882..9840958 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -982,10 +982,6 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
 
         if (zoneId != null) {
             sc.setParameters("dataCenterId", zoneId);
-
-            if (state == null) {
-                sc.setParameters("stateNEQ", "Destroyed");
-            }
         }
 
         if (affinityGroupId != null) {