From: Koren Lev <korenlev@gmail.com>
Date: Wed, 4 Oct 2017 09:59:19 +0000 (+0000)
Subject: Merge "merged master"
X-Git-Tag: opnfv-6.1.0~22
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f1601d958099a017df89596fbc18785bc4eb1b14;p=calipso.git

Merge "merged master"
---

f1601d958099a017df89596fbc18785bc4eb1b14