Merge "add composable services for Contrail"
authorJenkins <jenkins@review.openstack.org>
Fri, 9 Sep 2016 23:19:12 +0000 (23:19 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 9 Sep 2016 23:19:12 +0000 (23:19 +0000)

Trivial merge