Merge "Adds Calipso scenario"
authorDan Radez <dradez@redhat.com>
Thu, 21 Sep 2017 13:40:46 +0000 (13:40 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 21 Sep 2017 13:40:46 +0000 (13:40 +0000)

Trivial merge