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 2014/05/02 18:47:35 UTC
[1/3] git commit: updated refs/heads/4.4 to 5132264
Repository: cloudstack
Updated Branches:
refs/heads/4.4 62b210b58 -> 513226430
CLOUDSTACK-6513: templateFilter=shared should not show self-owned
template.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/554cab8e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/554cab8e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/554cab8e
Branch: refs/heads/4.4
Commit: 554cab8ea13614f3cbe5349b161672fb8da2c416
Parents: 62b210b
Author: Min Chen <mi...@citrix.com>
Authored: Tue Apr 29 19:02:57 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu May 1 10:37:46 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/api/query/QueryManagerImpl.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/554cab8e/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 9c31f47..8047ea6 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -3346,10 +3346,11 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
sc.addAnd("accountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
}
} else if (templateFilter == TemplateFilter.sharedexecutable || templateFilter == TemplateFilter.shared) {
- SearchCriteria<TemplateJoinVO> scc = _templateJoinDao.createSearchCriteria();
- scc.addOr("accountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
- scc.addOr("sharedAccountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
- sc.addAnd("accountId", SearchCriteria.Op.SC, scc);
+ sc.addAnd("sharedAccountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
+// SearchCriteria<TemplateJoinVO> scc = _templateJoinDao.createSearchCriteria();
+// scc.addOr("accountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
+// scc.addOr("sharedAccountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
+// sc.addAnd("accountId", SearchCriteria.Op.SC, scc);
} else if (templateFilter == TemplateFilter.executable) {
SearchCriteria<TemplateJoinVO> scc = _templateJoinDao.createSearchCriteria();
scc.addOr("publicTemplate", SearchCriteria.Op.EQ, true);
[2/3] git commit: updated refs/heads/4.4 to 5132264
Posted by da...@apache.org.
CLOUDSTACK-6513: remove commented code.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a3a0f13b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a3a0f13b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a3a0f13b
Branch: refs/heads/4.4
Commit: a3a0f13bb8f5a16c1660b26e3154a97e8a743c06
Parents: 554cab8
Author: Min Chen <mi...@citrix.com>
Authored: Wed Apr 30 10:03:06 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu May 1 10:38:05 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/api/query/QueryManagerImpl.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3a0f13b/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 8047ea6..8e020fc 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -3346,11 +3346,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
sc.addAnd("accountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
}
} else if (templateFilter == TemplateFilter.sharedexecutable || templateFilter == TemplateFilter.shared) {
+ // only show templates shared by others
sc.addAnd("sharedAccountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
-// SearchCriteria<TemplateJoinVO> scc = _templateJoinDao.createSearchCriteria();
-// scc.addOr("accountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
-// scc.addOr("sharedAccountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());
-// sc.addAnd("accountId", SearchCriteria.Op.SC, scc);
} else if (templateFilter == TemplateFilter.executable) {
SearchCriteria<TemplateJoinVO> scc = _templateJoinDao.createSearchCriteria();
scc.addOr("publicTemplate", SearchCriteria.Op.EQ, true);
[3/3] git commit: updated refs/heads/4.4 to 5132264
Posted by da...@apache.org.
CLOUDSTACK-6443: [Automation] Two Test Cases failed on "test_volumes.py"
- AttributeError: VirtualMachine instance has no attribute 'hostid'.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/51322643
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/51322643
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/51322643
Branch: refs/heads/4.4
Commit: 5132264309c91730debead4ef91c332991584642
Parents: a3a0f13
Author: Min Chen <mi...@citrix.com>
Authored: Thu May 1 10:05:16 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri May 2 18:47:20 2014 +0200
----------------------------------------------------------------------
.../apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51322643/api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java
index 99fec6b..77aa20f 100755
--- a/api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java
@@ -68,7 +68,7 @@ public class DeployVMCmdByAdmin extends DeployVMCmd {
}
if (result != null) {
- UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", result).get(0);
+ UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", result).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} else {