Merge "Configure ControllerServices via resource chains"
authorJenkins <jenkins@review.openstack.org>
Sun, 3 Apr 2016 15:33:06 +0000 (15:33 +0000)
committerGerrit Code Review <review@openstack.org>
Sun, 3 Apr 2016 15:33:07 +0000 (15:33 +0000)

Trivial merge