Merge remote-tracking branch 'origin/master' into jenkins-build-59

doc/puppet_classes/confdroid_nrpe_3A_3Acommands_3A_3Adefinition_rules.html

@@ -181,12 +181,7 @@
 77
 78
 79
-80
-81
-82
-83
-84
-85</pre>
+80</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/commands/definition_rules.pp', line 12</span>
@@ -258,11 +253,6 @@ class confdroid_nrpe::commands::definition_rules (
       ne_check_cmd     =&gt; &#39;check_procs&#39;,
       ne_cmd_argstring =&gt; &#39;-c $ARG1$ -a $ARG2$&#39;,
     }
-    confdroid_nrpe::commands::definitions { &#39;check_alloy&#39;:
-      ne_check_name    =&gt; &#39;check_alloy&#39;,
-      ne_check_cmd     =&gt; &#39;check_procs&#39;,
-      ne_cmd_argstring =&gt; &#39;-c $ARG1$ -a $ARG2$&#39;,
-    }
   }
 }</pre>
       </td>

manifests/commands/definition_rules.pp

@@ -76,10 +76,5 @@ class confdroid_nrpe::commands::definition_rules (
       ne_check_cmd     => 'check_procs',
       ne_cmd_argstring => '-c $ARG1$ -a $ARG2$',
     }
-    confdroid_nrpe::commands::definitions { 'check_alloy':
-      ne_check_name    => 'check_alloy',
-      ne_check_cmd     => 'check_procs',
-      ne_cmd_argstring => '-c $ARG1$ -a $ARG2$',
-    }
   }
 }