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 beb7e2788d3 DO NOT MERGE
add f0838cdd309 [VMware] Update vlans with proper range before creating
port group for dvSwitch (#10708)
add 696bc50f3ba Backport #9888 to 4.19: Fix Usage inconsistencies (#10712)
add 751a0ad5598 UI workaround for the inconsistent formatting of
listVirtualMachinesUsageHistory (#10824)
add ea32a1a71aa server: fetch IP of VMs on L2 networks (#10431)
add b518772f18a 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 (beb7e2788d3)
\
N -- N -- N refs/heads/healthcheck-4.19 (b518772f18a)
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:
.../com/cloud/agent/api/GetVmIpAddressCommand.java | 8 +-
.../java/com/cloud/usage/dao/UsageNetworksDao.java | 2 +
.../com/cloud/usage/dao/UsageNetworksDaoImpl.java | 27 ++++--
.../main/java/com/cloud/usage/dao/UsageVpcDao.java | 4 +
.../java/com/cloud/usage/dao/UsageVpcDaoImpl.java | 28 ++++--
.../LibvirtGetVmIpAddressCommandWrapper.java | 57 ++++++++----
.../LibvirtGetVmIpAddressCommandWrapperTest.java | 3 +
.../wrapper/xenbase/CitrixRequestWrapperTest.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 15 ++--
ui/src/components/view/StatsTab.vue | 2 +-
.../java/com/cloud/usage/UsageManagerImpl.java | 100 ++++++++++++++++-----
.../src/main/java/com/cloud/utils/StringUtils.java | 92 ++++++++++++++++++-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 22 +++--
.../vmware/mo/HypervisorHostHelperTest.java | 56 +++++++++++-
14 files changed, 350 insertions(+), 68 deletions(-)
