3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/modules/services/monitoring/nagios
Eelco Dolstra 3ad370ae0a Merge remote-tracking branch 'origin/master' into systemd
Conflicts:
	modules/misc/ids.nix
	modules/services/mail/postfix.nix
	modules/services/system/nscd.nix
	modules/services/x11/desktop-managers/xfce.nix
	modules/system/boot/stage-1.nix
2012-09-28 11:35:27 -04:00
..
commands.cfg * Continued refactoring the tree: moved most Upstart jobs (namely 2009-05-24 23:13:23 +00:00
default.nix Merge remote-tracking branch 'origin/master' into systemd 2012-09-28 11:35:27 -04:00
host-templates.cfg * Continued refactoring the tree: moved most Upstart jobs (namely 2009-05-24 23:13:23 +00:00
service-templates.cfg * Continued refactoring the tree: moved most Upstart jobs (namely 2009-05-24 23:13:23 +00:00
timeperiods.cfg * Continued refactoring the tree: moved most Upstart jobs (namely 2009-05-24 23:13:23 +00:00