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 2020/02/26 15:19:30 UTC
[cloudstack] branch master updated (0ad2370 -> a62a10c)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 0ad2370 Enable Direct Download for System VMs (#3731)
add 4d8a2da api: Fix count and item issues returned by list APIs (#3894)
new a62a10c Merge branch '4.13'
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:
api/src/main/java/com/cloud/projects/Project.java | 2 +-
.../api/command/admin/cluster/ListClustersCmd.java | 8 +++----
.../src/main/java/com/cloud/host/dao/HostDao.java | 2 ++
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 13 +++++++++++
.../java/com/cloud/vm/dao/DomainRouterDao.java | 7 ++++++
.../java/com/cloud/vm/dao/DomainRouterDaoImpl.java | 8 +++++++
.../storage/datastore/db/ImageStoreDao.java | 2 ++
.../storage/datastore/db/ImageStoreDaoImpl.java | 8 +++++++
.../main/java/com/cloud/utils/db/GenericDao.java | 2 ++
.../java/com/cloud/utils/db/GenericDaoBase.java | 9 ++++++++
.../cloudstack/api/ListClustersMetricsCmd.java | 8 +++++--
.../apache/cloudstack/api/ListHostsMetricsCmd.java | 6 ++++--
.../cloudstack/api/ListStoragePoolsMetricsCmd.java | 6 ++++--
.../apache/cloudstack/api/ListVMsMetricsCmd.java | 6 ++++--
.../cloudstack/api/ListVolumesMetricsCmd.java | 6 ++++--
.../apache/cloudstack/api/ListZonesMetricsCmd.java | 6 ++++--
.../apache/cloudstack/metrics/MetricsService.java | 3 ++-
.../cloudstack/metrics/MetricsServiceImpl.java | 25 ++++++++++++++--------
.../response/InfrastructureResponse.java | 12 +++++++++++
.../java/com/cloud/api/query/QueryManagerImpl.java | 6 +++---
.../com/cloud/server/ManagementServerImpl.java | 2 +-
.../java/com/cloud/user/AccountManagerImpl.java | 14 ++++++------
.../java/com/cloud/user/MockUsageEventDao.java | 5 +++++
ui/scripts/system.js | 10 ++++-----
24 files changed, 134 insertions(+), 42 deletions(-)
[cloudstack] 01/01: Merge branch '4.13'
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit a62a10c81439fc0af18ddd604c29b2314ff725cc
Merge: 0ad2370 4d8a2da
Author: Daan Hoogland <da...@shapeblue.com>
AuthorDate: Wed Feb 26 16:18:41 2020 +0100
Merge branch '4.13'
api/src/main/java/com/cloud/projects/Project.java | 2 +-
.../api/command/admin/cluster/ListClustersCmd.java | 8 +++----
.../src/main/java/com/cloud/host/dao/HostDao.java | 2 ++
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 13 +++++++++++
.../java/com/cloud/vm/dao/DomainRouterDao.java | 7 ++++++
.../java/com/cloud/vm/dao/DomainRouterDaoImpl.java | 8 +++++++
.../storage/datastore/db/ImageStoreDao.java | 2 ++
.../storage/datastore/db/ImageStoreDaoImpl.java | 8 +++++++
.../main/java/com/cloud/utils/db/GenericDao.java | 2 ++
.../java/com/cloud/utils/db/GenericDaoBase.java | 9 ++++++++
.../cloudstack/api/ListClustersMetricsCmd.java | 8 +++++--
.../apache/cloudstack/api/ListHostsMetricsCmd.java | 6 ++++--
.../cloudstack/api/ListStoragePoolsMetricsCmd.java | 6 ++++--
.../apache/cloudstack/api/ListVMsMetricsCmd.java | 6 ++++--
.../cloudstack/api/ListVolumesMetricsCmd.java | 6 ++++--
.../apache/cloudstack/api/ListZonesMetricsCmd.java | 6 ++++--
.../apache/cloudstack/metrics/MetricsService.java | 3 ++-
.../cloudstack/metrics/MetricsServiceImpl.java | 25 ++++++++++++++--------
.../response/InfrastructureResponse.java | 12 +++++++++++
.../java/com/cloud/api/query/QueryManagerImpl.java | 6 +++---
.../com/cloud/server/ManagementServerImpl.java | 2 +-
.../java/com/cloud/user/AccountManagerImpl.java | 14 ++++++------
.../java/com/cloud/user/MockUsageEventDao.java | 5 +++++
ui/scripts/system.js | 10 ++++-----
24 files changed, 134 insertions(+), 42 deletions(-)