Merge "network/config storage role fixes"
authorJenkins <jenkins@review.openstack.org>
Tue, 16 Jun 2015 07:50:19 +0000 (07:50 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 16 Jun 2015 07:50:19 +0000 (07:50 +0000)

Trivial merge