This is an automated email from the ASF dual-hosted git repository. sureshanaparti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 571339f8724fc70c472f55f254125f0c6070d5de Merge: f610e89 1fc7d70 Author: Suresh Kumar Anaparti <[email protected]> AuthorDate: Mon Jan 31 00:10:03 2022 +0530 Merge branch '4.16' into main .../java/com/cloud/usage/UsageIPAddressVO.java | 19 +++- .../com/cloud/usage/UsageLoadBalancerPolicyVO.java | 18 +++- .../com/cloud/usage/UsageNetworkOfferingVO.java | 17 +++- .../com/cloud/usage/UsagePortForwardingRuleVO.java | 18 +++- .../java/com/cloud/usage/UsageSecurityGroupVO.java | 17 +++- .../com/cloud/usage/UsageSnapshotOnPrimaryVO.java | 16 ++- .../main/java/com/cloud/usage/UsageStorageVO.java | 20 +++- .../java/com/cloud/usage/UsageVMInstanceVO.java | 17 +++- .../java/com/cloud/usage/UsageVMSnapshotVO.java | 17 +++- .../main/java/com/cloud/usage/UsageVPNUserVO.java | 17 +++- .../main/java/com/cloud/usage/UsageVolumeVO.java | 18 +++- .../com/cloud/usage/dao/UsageIPAddressDaoImpl.java | 6 +- .../usage/dao/UsageLoadBalancerPolicyDaoImpl.java | 12 +-- .../usage/dao/UsagePortForwardingRuleDaoImpl.java | 12 +-- .../com/cloud/usage/dao/UsageStorageDaoImpl.java | 16 +-- .../cloud/usage/dao/UsageVMSnapshotDaoImpl.java | 12 +-- .../usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java | 6 +- .../com/cloud/usage/dao/UsageVolumeDaoImpl.java | 12 +-- .../main/java/com/cloud/user/UserStatsLogVO.java | 15 ++- .../resources/META-INF/db/schema-41600to41610.sql | 107 +++++++++++++++++++++ .../cloud/usage/dao/UsageStorageDaoImplTest.java | 4 +- .../cloud/usage/parser/IPAddressUsageParser.java | 4 +- .../usage/parser/LoadBalancerUsageParser.java | 4 +- .../usage/parser/PortForwardingUsageParser.java | 4 +- .../com/cloud/usage/parser/StorageUsageParser.java | 4 +- .../usage/parser/VMSnapshotOnPrimaryParser.java | 2 +- .../cloud/usage/parser/VMSnapshotUsageParser.java | 4 +- .../com/cloud/usage/parser/VolumeUsageParser.java | 4 +- 28 files changed, 342 insertions(+), 80 deletions(-)
