Merge "Adds Calipso scenario"
authorFeng Pan <fpan@redhat.com>
Sat, 30 Sep 2017 15:08:38 +0000 (15:08 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sat, 30 Sep 2017 15:08:38 +0000 (15:08 +0000)

Trivial merge