This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch healthcheck-4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 871a27adb92 Merge branch '4.19' into healthcheck-4.19
discard 8bc7c3da414 DO NOT MERGE
add 60af31c9c0b Decrypt zone, cluster, storage details for configuration
values (#10237)
add fa5c11e6b2e UI: list backup offerings by zoneid when assign vm to
backup offering (#10217)
add c1bc57b844b List default network offerings when multiple physical
networks for guest traffic type exists (#10222)
add 238d0c5e30a Fix NPE while checking for user data provider (#10255)
add 37c29f82eda server: fix snapshot physical size (#10216)
add 01f44b78939 DO NOT MERGE
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (871a27adb92)
\
N -- N -- N refs/heads/healthcheck-4.19 (01f44b78939)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../main/java/com/cloud/dc/ClusterDetailsDao.java | 3 +-
.../java/com/cloud/dc/ClusterDetailsDaoImpl.java | 16 ++-
.../main/java/com/cloud/dc/ClusterDetailsVO.java | 18 ++--
.../com/cloud/dc/dao/DataCenterDetailsDaoImpl.java | 5 +-
.../main/java/com/cloud/domain/DomainDetailVO.java | 18 ++--
.../com/cloud/domain/dao/DomainDetailsDao.java | 5 +-
.../com/cloud/domain/dao/DomainDetailsDaoImpl.java | 26 ++---
.../storage/dao/StoragePoolDetailsDaoImpl.java | 2 +-
.../main/java/com/cloud/user/AccountDetailVO.java | 18 ++--
.../java/com/cloud/user/AccountDetailsDao.java | 5 +-
.../java/com/cloud/user/AccountDetailsDaoImpl.java | 26 ++---
.../resourcedetail/ResourceDetailsDao.java | 2 +
.../resourcedetail/ResourceDetailsDaoBase.java | 18 ++++
.../datastore/db/ImageStoreDetailsDaoImpl.java | 4 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 76 +++++++-------
.../com/cloud/api/query/dao/SnapshotJoinDao.java | 6 +-
.../cloud/api/query/dao/SnapshotJoinDaoImpl.java | 34 +++++--
.../configuration/ConfigurationManagerImpl.java | 17 +++-
.../java/com/cloud/network/NetworkModelImpl.java | 6 +-
.../network/element/ConfigDriveNetworkElement.java | 19 +++-
.../network/element/VirtualRouterElement.java | 7 +-
.../api/query/dao/SnapshotJoinDaoImplTest.java | 109 +++++++++++++++++++++
ui/src/config/section/compute.js | 4 +
23 files changed, 311 insertions(+), 133 deletions(-)
create mode 100644
server/src/test/java/com/cloud/api/query/dao/SnapshotJoinDaoImplTest.java
