Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
On masterless setups, this module would otherwise complain
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit 02d2ca2df868262728c67c13d5dbf484c001d380.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
README
manifests/irc_bot.pp
manifests/irc_bot/base.pp
templates/irc_bot/nsa.cfg.erb
|
|
|
|
|
|
|
|
merge
|
|
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
Conflicts:
README
manifests/service.pp
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
templates/irc_bot/nsa.cfg.erb
|
|
|
|
|
|
|
|
|
|
|