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 f98940953b1632d20aa68ca34439d01a6f359d64
Merge: e6fef05 abec6d1
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Thu Jan 28 14:31:04 2021 +0530
Merge remote-tracking branch 'origin/4.15'
INSTALL.md | 6 +++
client/pom.xml | 3 +-
debian/cloudstack-management.install | 1 +
...ck-management.install => cloudstack-ui.install} | 22 +--------
debian/control | 7 ++-
debian/rules | 14 ++++++
packaging/centos7/cloud.spec | 29 +++++++++++
packaging/centos8/cloud.spec | 29 +++++++++++
pom.xml | 56 +++++++++++-----------
tools/travis/before_install.sh | 6 +++
ui/{ => public}/error.html | 0
11 files changed, 123 insertions(+), 50 deletions(-)
