Merge "Calipso initial release for OPNFV"
authorKoren Lev <korenlev@gmail.com>
Thu, 27 Jul 2017 15:04:07 +0000 (15:04 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 27 Jul 2017 15:04:07 +0000 (15:04 +0000)

Trivial merge