You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/09/24 12:00:17 UTC
[1/2] git commit: updated refs/heads/4.1 to f4abe36
Updated Branches:
refs/heads/4.1 5aee73b1a -> f4abe364a
CLOUDSTACK-2629: ListRouters with networkid throws exception.(cherry picked from commit 19321d4eeb7accd2bd67af1c8b2c2a5988a23ac0)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5c7c6037
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5c7c6037
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5c7c6037
Branch: refs/heads/4.1
Commit: 5c7c6037521760ec207f6073cf1047258af9c658
Parents: 5aee73b
Author: Min Chen <mi...@citrix.com>
Authored: Wed May 22 15:27:04 2013 -0700
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Tue Sep 24 12:00:01 2013 +0200
----------------------------------------------------------------------
server/src/com/cloud/api/query/QueryManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c7c6037/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 9a78b2e..0fc40c8 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -1040,7 +1040,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
}
if (networkId != null) {
- sc.setJoinParameters("nicSearch", "networkId", networkId);
+ sc.setParameters("networkId", networkId);
}
if (vpcId != null) {
[2/2] git commit: updated refs/heads/4.1 to f4abe36
Posted by we...@apache.org.
fix issue: listHosts with hahost throws exception
(cherry picked from commit a206f423a3851a4d090f58b05e2936dd68c528d0)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4abe364
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4abe364
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4abe364
Branch: refs/heads/4.1
Commit: f4abe364a8c74e4661614cfb0ef3c6ba1afb8a32
Parents: 5c7c603
Author: Wei Zhou <w....@leaseweb.com>
Authored: Tue Sep 24 11:59:05 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Tue Sep 24 12:00:07 2013 +0200
----------------------------------------------------------------------
server/src/com/cloud/api/query/QueryManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4abe364/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 0fc40c8..c57b072 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -1424,7 +1424,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
}
if (haHosts != null && haTag != null && !haTag.isEmpty()) {
- sc.setJoinParameters("hostTagSearch", "tag", haTag);
+ sc.setParameters("tag", haTag);
}
// search host details by ids