Merge "Composable OpenContrail compute plugin"
authorJenkins <jenkins@review.openstack.org>
Tue, 12 Jul 2016 17:43:29 +0000 (17:43 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 12 Jul 2016 17:43:29 +0000 (17:43 +0000)

Trivial merge