Merge "Fix service config files having wrong map_merge format"
authorJenkins <jenkins@review.openstack.org>
Mon, 12 Sep 2016 09:39:05 +0000 (09:39 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 12 Sep 2016 09:39:05 +0000 (09:39 +0000)
commitede33f67b9d35e13b0341732852f76e84e115245
tree2df670e8c916e24c3029187bfbd5626c457c34e7
parent692e9e6a7c0a661763c716837cdf4e6c4a182fdb
parent85df73d23915e29fbffed479e128c30c951b76f0
Merge "Fix service config files having wrong map_merge format"
puppet/services/neutron-ovs-agent.yaml