From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 12 Sep 2016 09:39:05 +0000 (+0000)
Subject: Merge "Fix service config files having wrong map_merge format"
X-Git-Tag: opnfv-6.0.0~1617
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ede33f67b9d35e13b0341732852f76e84e115245;p=apex-tripleo-heat-templates.git

Merge "Fix service config files having wrong map_merge format"
---

ede33f67b9d35e13b0341732852f76e84e115245