diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-14 19:32:00 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-14 19:32:00 -0500 |
| commit | 27052f33d329118e116d5ce1cffb994ff18d773c (patch) | |
| tree | 89681f81b143783704f2e6701b491fc53ea56de8 /manifests/irc_bot/base.pp | |
| parent | db5987a9a1c85371d6028cf375409ffed5be0cf0 (diff) | |
| parent | 0911d9cb17f4c02aa42f2da4cd95f8323a239cdd (diff) | |
Merge branch 'add_pnp4nagios' of ssh://code.leap.se/puppet_nagios into add_pnp4nagios
Conflicts:
README.pnp4nagios
manifests/defaults/pnp4nagios.pp
manifests/pnp4nagios.pp
manifests/pnp4nagios/popup.pp
Diffstat (limited to 'manifests/irc_bot/base.pp')
0 files changed, 0 insertions, 0 deletions