Merge remote-tracking branch 'origin/4.15'

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: yadvr

debian/changelog

@@ -1,3 +1,9 @@
+cloudstack (4.16.0.0-SNAPSHOT) unstable; urgency=low
+
+  * Update the version to 4.16.0.0-SNAPSHOT
+
+ -- the Apache CloudStack project <dev@cloudstack.apache.org>  Tue, 11 Jan 2021 10:51:02 +0000
+
 cloudstack (4.15.0.0) unstable; urgency=low
 
   * Update the version to 4.15.0.0

tools/docker/Dockerfile

@@ -20,7 +20,7 @@
 FROM ubuntu:18.04
 
 MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.15.0.0"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.0.0-SNAPSHOT"
 
 ARG DEBIAN_FRONTEND=noninteractive
 

tools/docker/Dockerfile.marvin

@@ -20,7 +20,7 @@
 FROM python:2
 
 MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.15.0.0"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.0.0-SNAPSHOT"
 
 ENV WORK_DIR=/marvin
 

tools/marvin/setup.py

@@ -27,7 +27,7 @@
         raise RuntimeError("python setuptools is required to build Marvin")
 
 
-VERSION = "4.15.0.0"
+VERSION = "4.16.0.0-SNAPSHOT"
 
 setup(name="Marvin",
       version=VERSION,