tree d8e0fb107ec178ab82f06f13aff7b1a967f41831
parent ad2494b8d6f09ccdaf90dc171c20d48e9c76096d
parent 5986ddef6e0d28eaff99ed42d8ce82d6da16e2f5
author Jenkins <jenkins@review.openstack.org> 1390930973 +0000
committer Gerrit Code Review <review@openstack.org> 1390930973 +0000

Merge "Split the config out into two files"