This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.12
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit a2323e1425be13bec9d74f970be8cd6b1dd86503
Merge: 018bba3 2408783
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Wed Jun 26 16:27:29 2019 +0530
Merge remote-tracking branch 'origin/4.11' into 4.12
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 3 ++-
.../java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
