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 e107f9aa93cb1f507420e9ce90860cda42bd3433
Merge: 3c8a504 a5e53dc
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Wed Apr 21 13:07:44 2021 +0530
Merge remote-tracking branch 'origin/4.15'
debian/rules | 2 +-
.../cloudstack/cloudian/CloudianConnector.java | 2 +-
.../main/java/com/cloud/server/StatsCollector.java | 20 ++++++++++++++------
ui/src/config/section/offering.js | 4 ++--
ui/src/config/section/storage.js | 8 +++++++-
ui/src/views/AutogenView.vue | 4 ++--
ui/src/views/compute/DeployVM.vue | 17 ++++++++++++++---
.../cloud/utils/exception/CSExceptionErrorCode.java | 1 +
8 files changed, 42 insertions(+), 16 deletions(-)
