From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 17 Dec 2015 10:20:03 +0000 (+0000)
Subject: Merge "Allows customization of the HAProxy default timeouts"
X-Git-Tag: opnfv-6.0.0~821
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=dde57d6fe717e38c253223a0244f52e2c72f661c;p=apex-puppet-tripleo.git

Merge "Allows customization of the HAProxy default timeouts"
---

dde57d6fe717e38c253223a0244f52e2c72f661c