Merge "Wire in hieradata overrides via ExtraConfig for ObjectStorage"
authorJenkins <jenkins@review.openstack.org>
Thu, 23 Jul 2015 13:51:22 +0000 (13:51 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 23 Jul 2015 13:51:22 +0000 (13:51 +0000)
1  2 
overcloud-without-mergepy.yaml
puppet/swift-storage-puppet.yaml

Simple merge
Simple merge