From: gecong1973 <ge.cong@zte.com.cn>
Date: Fri, 30 Sep 2016 06:51:20 +0000 (+0800)
Subject: Fix a typo in haproxy.pp
X-Git-Tag: opnfv-6.0.0~451^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3cb18bbc89cef24b2daf4e264a83fa9ed2f7d0ac;p=apex-puppet-tripleo.git

Fix a typo in haproxy.pp

TrivialFix

Change-Id: Ibbd79ef0db6585e1eed2936bb9aa08c894d5af13
---

diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 6a81731..1fc0312 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -1007,7 +1007,7 @@ class tripleo::haproxy (
         # NOTE(jaosorior): Websockets have more overhead in establishing
         # connections than regular HTTP connections. Also, since it begins
         # as an HTTP connection and then "upgrades" to a TCP connection, some
-        # timeouts get overriden by others at certain times of the connection.
+        # timeouts get overridden by others at certain times of the connection.
         # The following values were taken from the following site:
         # http://blog.haproxy.com/2012/11/07/websockets-load-balancing-with-haproxy/
         'timeout' => ['connect 5s', 'client 25s', 'server 25s', 'tunnel 3600s'],