diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-19 10:49:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-19 10:49:12 +0000 |
| commit | b9745a7b1e568647c401a3593e172f4d40bbf454 (patch) | |
| tree | 618d551d261aa2facd57240a20a3a366a9fb86a2 /manifests | |
| parent | d155415b723f0c1789a7510235e01566dd11a1a7 (diff) | |
| parent | 3cb18bbc89cef24b2daf4e264a83fa9ed2f7d0ac (diff) | |
Merge "Fix a typo in haproxy.pp"
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/haproxy.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 515f49a..58b73e0 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -1331,7 +1331,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'], |