This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit a2c92029f5f0d2c2e181f2476cc402d8bee0db70 Merge: 0d4f67a 88c5e6e Author: Rohit Yadav <[email protected]> AuthorDate: Thu Jun 18 09:50:54 2020 +0530 Merge remote-tracking branch 'origin/4.14' .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../api/command/user/iso/ListIsosCmd.java | 9 +++- .../command/user/template/ListTemplatesCmd.java | 9 +++- .../java/com/cloud/api/query/QueryManagerImpl.java | 54 ++++++++++++++-------- .../com/cloud/api/query/dao/TemplateJoinDao.java | 1 + .../cloud/api/query/dao/TemplateJoinDaoImpl.java | 17 +++++++ 6 files changed, 70 insertions(+), 21 deletions(-)
