This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 567524a2a5893668777df2060f77b5d179d94ce7
Merge: 612100c b54d19b
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Tue Jun 16 13:31:29 2020 +0530
Merge remote-tracking branch 'origin/4.14'
api/src/main/java/com/cloud/event/EventTypes.java | 1 +
.../java/com/cloud/usage/dao/UsageBackupDao.java | 7 +--
.../com/cloud/usage/dao/UsageBackupDaoImpl.java | 71 +++++++++++-----------
.../java/com/cloud/utils/db/TransactionLegacy.java | 14 ++---
.../cloudstack/backup/DummyBackupProvider.java | 7 ++-
.../cloudstack/backup/VeeamBackupProvider.java | 5 +-
.../cloudstack/backup/BackupManagerImpl.java | 40 +++++-------
.../java/com/cloud/usage/UsageManagerImpl.java | 9 ++-
8 files changed, 75 insertions(+), 79 deletions(-)
