From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 12 Jun 2017 22:28:25 +0000 (+0000)
Subject: Merge "Fix typo in haproxy docker mapping"
X-Git-Tag: opnfv-6.0.0~565
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=571778f2f001fccf5758254dc4c62deff809a71c;p=apex-tripleo-heat-templates.git

Merge "Fix typo in haproxy docker mapping"
---

571778f2f001fccf5758254dc4c62deff809a71c