This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 0d4f67a server: NPE occured when dynamic scaling tried on VM and as
part of this when VM tries to migrate if current host does not have capacity.
(#3998)
add e9f59e2 server: Adding showunique parameter to list templates and
isos (#4140)
add 88c5e6e Merge remote-tracking branch 'origin/4.13' into 4.14
new a2c9202 Merge remote-tracking branch 'origin/4.14'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
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(-)
