Merge branch 'jenkins-build-238' into 'master'

Auto-merge for build 238

See merge request puppet/confdroid_nagios!3

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html

@@ -324,17 +324,7 @@ and populates /etc/nagios/conf.d/nagios_commands.cfg.
 229
 230
 231
-232
+232</pre>
-233
-234
-235
-236
-237
-238
-239
-240
-241
-242</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/nagios/objects/commands.pp', line 8</span>
@@ -562,16 +552,6 @@ class confdroid_nagios::nagios::objects::commands (
       mode         =&gt; &#39;0640&#39;,
       target       =&gt; $ng_target_command,
     }
-
-    @@nagios_command { &#39;check_alloy&#39;:
-      ensure       =&gt; present,
-      command_name =&gt; &#39;check_alloy&#39;,
-      command_line =&gt; &#39;$USER1$/check_procs -c $ARG1$ -C $ARG2$&#39;,
-      owner        =&gt; $ng_user,
-      group        =&gt; $ng_user,
-      mode         =&gt; &#39;0640&#39;,
-      target       =&gt; $ng_target_command,
-    }
   }
 }</pre>
       </td>

manifests/nagios/objects/commands.pp

@@ -228,15 +228,5 @@ class confdroid_nagios::nagios::objects::commands (
       mode         => '0640',
       target       => $ng_target_command,
     }
-
-    @@nagios_command { 'check_alloy':
-      ensure       => present,
-      command_name => 'check_alloy',
-      command_line => '$USER1$/check_procs -c $ARG1$ -C $ARG2$',
-      owner        => $ng_user,
-      group        => $ng_user,
-      mode         => '0640',
-      target       => $ng_target_command,
-    }
   }
 }