| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2013-01-02 | Merge remote-tracking branch 'riseup/master' into HEAD | mh | |
| Conflicts: manifests/apache.pp manifests/base.pp manifests/defaults/templates.pp manifests/defaults/vars.pp manifests/init.pp manifests/irc_bot.pp manifests/nsca/client.pp manifests/nsca/server.pp manifests/service.pp manifests/service/mysql.pp templates/irc_bot/nsa.cfg.erb | |||
 |
index : puppet_nagios.git | |
| [puppet_nagios] | git repository hosting |
| summaryrefslogtreecommitdiff |