This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 0a034da Merge remote-tracking branch 'origin/4.13' into 4.14
add e9f59e2 server: Adding showunique parameter to list templates and
isos (#4140)
add 88c5e6e Merge remote-tracking branch 'origin/4.13' into 4.14
No new revisions were added by this update.
Summary of changes:
.../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(-)
