Merge "Removes opencontrail reference"
authorJenkins <jenkins@review.openstack.org>
Fri, 3 Mar 2017 11:48:34 +0000 (11:48 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 3 Mar 2017 11:48:34 +0000 (11:48 +0000)

Trivial merge