From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 15 Oct 2014 22:17:27 +0000 (+0000)
Subject: Merge "Configures haproxy to serve novnc_proxy"
X-Git-Tag: opnfv-6.0.0~2736
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ad0692e3e8b5aff92e919a3a9f702697ec52e659;p=apex-tripleo-heat-templates.git

Merge "Configures haproxy to serve novnc_proxy"
---

ad0692e3e8b5aff92e919a3a9f702697ec52e659