This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 148fab4e431644013e2dde51ba9e1053a42b920d Merge: 88c5e6e 06f3ff0 Author: Rohit Yadav <[email protected]> AuthorDate: Thu Jun 18 19:48:12 2020 +0530 Merge remote-tracking branch 'origin/4.13' into 4.14 .../src/main/java/org/apache/cloudstack/api/ListVMsMetricsCmd.java | 4 ++-- server/src/main/java/com/cloud/api/query/QueryManagerImpl.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --cc server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index 1847d51,c41cd0e..8cac107 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@@ -1764,9 -1690,9 +1765,9 @@@ public class QueryManagerImpl extends M Pair<List<VolumeJoinVO>, Integer> result = searchForVolumesInternal(cmd); ListResponse<VolumeResponse> response = new ListResponse<VolumeResponse>(); - ResponseView respView = ResponseView.Restricted; + ResponseView respView = cmd.getResponseView(); Account account = CallContext.current().getCallingAccount(); - if (_accountMgr.isAdmin(account.getAccountId())) { + if (_accountMgr.isRootAdmin(account.getAccountId())) { respView = ResponseView.Full; }
