From: Dan Radez <dradez@redhat.com>
Date: Fri, 20 May 2016 20:25:18 +0000 (+0000)
Subject: Merge "Adds nosdn-noha scenario and fixes opencontrail scenario naming"
X-Git-Tag: colorado.1.0~232
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=967243a0bb93972820eecafdfb2c925b5fe81420;p=apex.git

Merge "Adds nosdn-noha scenario and fixes opencontrail scenario naming"
---

967243a0bb93972820eecafdfb2c925b5fe81420