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 366785a2d57fe4cd85a8f068de6abc71b8e2df6c Merge: 015bb20c b482da8 Author: Rohit Yadav <[email protected]> AuthorDate: Mon Jan 11 14:11:33 2021 +0530 Merge remote-tracking branch 'origin/4.15' Signed-off-by: Rohit Yadav <[email protected]> debian/changelog | 6 ++++++ tools/docker/Dockerfile | 2 +- tools/docker/Dockerfile.marvin | 2 +- tools/marvin/setup.py | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --cc debian/changelog index 0f8bb8a,e6f2333..1c79e58 --- a/debian/changelog +++ b/debian/changelog @@@ -1,3 -1,9 +1,9 @@@ -cloudstack (4.15.1.0-SNAPSHOT) unstable; urgency=low ++cloudstack (4.16.0.0-SNAPSHOT) unstable; urgency=low + - * Update the version to 4.15.1.0-SNAPSHOT ++ * Update the version to 4.16.0.0-SNAPSHOT + + -- the Apache CloudStack project <[email protected]> Tue, 11 Jan 2021 10:51:02 +0000 + cloudstack (4.15.0.0) unstable; urgency=low * Update the version to 4.15.0.0 diff --cc tools/docker/Dockerfile index 7ada709,a3e5276..466942a --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@@ -20,7 -20,7 +20,7 @@@ FROM ubuntu:18.04 MAINTAINER "Apache CloudStack" <[email protected]> - LABEL Vendor="Apache.org" License="ApacheV2" Version="4.15.0.0" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.15.1.0-SNAPSHOT" ++LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.0.0-SNAPSHOT" ARG DEBIAN_FRONTEND=noninteractive diff --cc tools/docker/Dockerfile.marvin index 33eca3e,76175aa..ecbb1bc --- a/tools/docker/Dockerfile.marvin +++ b/tools/docker/Dockerfile.marvin @@@ -20,7 -20,7 +20,7 @@@ FROM python:2 MAINTAINER "Apache CloudStack" <[email protected]> - LABEL Vendor="Apache.org" License="ApacheV2" Version="4.15.0.0" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.15.1.0-SNAPSHOT" ++LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.0.0-SNAPSHOT" ENV WORK_DIR=/marvin diff --cc tools/marvin/setup.py index 729626a,67f632c..275b6e3 --- a/tools/marvin/setup.py +++ b/tools/marvin/setup.py @@@ -27,7 -27,7 +27,7 @@@ except ImportError raise RuntimeError("python setuptools is required to build Marvin") - VERSION = "4.15.0.0" -VERSION = "4.15.1.0-SNAPSHOT" ++VERSION = "4.16.0.0-SNAPSHOT" setup(name="Marvin", version=VERSION,
