This is an automated email from the ASF dual-hosted git repository. weizhou pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 69998f7c40f api,server: support templatetype when upload template from local (#11682) add 9167cd3b722 server: use /prod/stat to get uptime instead of the uptime command (#11670) add 393b5d2b779 VR: consider NICs for remote access VPN when apply dhcp entry (#11681) add 12513e18fa3 server: Update gson date format for serializing/deserializing Date in MS stats (#11506) new 22bf8fd5d14 Merge remote-tracking branch 'apache/4.20' 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: .../server/ManagementServerHostStatsEntry.java | 2 +- .../main/java/com/cloud/server/StatsCollector.java | 19 ++-- .../java/com/cloud/server/StatsCollectorTest.java | 112 +++++++++++++++++++++ systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +- utils/src/main/java/com/cloud/utils/DateUtil.java | 2 +- 5 files changed, 126 insertions(+), 11 deletions(-)