recommit for updates in build 120

doc/puppet_classes/cd_haproxy_3A_3Aparams.html

@@ -642,12 +642,14 @@ failure.</p>
   
     <li>
       
-        <span class='name'>hy_hy_timeout_connect</span>
+        <span class='name'>hy_timeout_connect</span>
       
       
         <span class='type'>(<tt>string</tt>)</span>
       
       
+        <em class="default">(defaults to: <tt>&#39;10s&#39;</tt>)</em>
+      
       
         &mdash;
         <div class='inline'>
@@ -691,19 +693,6 @@ succeed.</p>
 <p>Set the maximum inactivity time on the server side.</p>
 </div>
       
-    </li>
-  
-    <li>
-      
-        <span class='name'>hy_timeout_connect</span>
-      
-      
-        <span class='type'>(<tt>Any</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;10s&#39;</tt>)</em>
-      
-      
     </li>
   
     <li>
@@ -711,12 +700,17 @@ succeed.</p>
         <span class='name'>hy_timeout_http_keep_alive</span>
       
       
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
       
       
         <em class="default">(defaults to: <tt>&#39;10s&#39;</tt>)</em>
       
       
+        &mdash;
+        <div class='inline'>
+<p>set the timeout value for keeping https connections alive</p>
+</div>
+      
     </li>
   
     <li>
@@ -724,12 +718,17 @@ succeed.</p>
         <span class='name'>hy_timeout_check</span>
       
       
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
       
       
         <em class="default">(defaults to: <tt>&#39;10s&#39;</tt>)</em>
       
       
+        &mdash;
+        <div class='inline'>
+<p>set the timeout value for how long to check if the timeout has occured</p>
+</div>
+      
     </li>
   
 </ul>
@@ -749,10 +748,6 @@ succeed.</p>
         <pre class="lines">
 
 
-74
-75
-76
-77
 78
 79
 80
@@ -825,10 +820,14 @@ succeed.</p>
 147
 148
 149
-150</pre>
+150
+151
+152
+153
+154</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 74</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 78</span>
 
 class cd_haproxy::params (
 

doc/puppet_defined_types/cd_haproxy_3A_3Aserver_3A_3Aproxy.html

@@ -312,12 +312,17 @@ instance configuration.</p>
         <span class='name'>be_server_name</span>
       
       
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>string</tt>)</span>
       
       
         <em class="default">(defaults to: <tt>undef</tt>)</em>
       
       
+        &mdash;
+        <div class='inline'>
+<p>set the name for the backend server</p>
+</div>
+      
     </li>
   
 </ul>
@@ -330,7 +335,6 @@ instance configuration.</p>
         <pre class="lines">
 
 
-40
 41
 42
 43
@@ -373,10 +377,11 @@ instance configuration.</p>
 80
 81
 82
-83</pre>
+83
+84</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/server/proxy.pp', line 40</span>
+        <pre class="code"><span class="info file"># File 'manifests/server/proxy.pp', line 41</span>
 
 define cd_haproxy::server::proxy (