This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit f58b72f6f7f79c86f77f1050616ba6d08bcf6939
Merge: 5edcf33 5396325
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Sun Jun 27 18:25:46 2021 +0530
Merge remote-tracking branch 'origin/4.15'
.../cloud/entity/api/VMEntityManagerImpl.java | 2 ++
.../storage/snapshot/CephSnapshotStrategy.java | 4 ----
.../storage/snapshot/CephSnapshotStrategyTest.java | 2 --
packaging/centos7/cloud.spec | 4 ++--
packaging/centos8/cloud.spec | 4 ++--
.../SecondaryStorageManagerImpl.java | 2 +-
systemvm/debian/opt/cloud/bin/configure.py | 2 +-
systemvm/debian/opt/cloud/bin/setup/common.sh | 6 ++----
systemvm/debian/opt/cloud/bin/setup/router.sh | 7 +++++++
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 7 +++++++
ui/src/components/view/QuickView.vue | 2 +-
ui/src/components/view/SearchView.vue | 6 +++++-
ui/src/config/section/compute.js | 22 ++++++++++++++++++++++
ui/src/views/AutogenView.vue | 3 +++
ui/src/views/compute/DeployVM.vue | 2 +-
15 files changed, 56 insertions(+), 19 deletions(-)
