Skip to content
Blame Permalink
  • taggart's avatar
    6eedb1bc
    Merge remote-tracking branch 'shared/master' into OctMerge · 6eedb1bc
    taggart authored 
    merging with shared

Conflicts:
	README
	README.pnp4nagios
	files/pnp4nagios/apache.conf
	manifests/defaults/commands.pp
	manifests/init.pp
	manifests/pnp4nagios.pp
	manifests/pnp4nagios/popup.pp
	manifests/service.pp
	templates/nrpe/nrpe_command.erb
    6eedb1bc
    Merge remote-tracking branch 'shared/master' into OctMerge
    taggart authored 
    merging with shared

Conflicts:
	README
	README.pnp4nagios
	files/pnp4nagios/apache.conf
	manifests/defaults/commands.pp
	manifests/init.pp
	manifests/pnp4nagios.pp
	manifests/pnp4nagios/popup.pp
	manifests/service.pp
	templates/nrpe/nrpe_command.erb