Shea Levy 75ec5c609e Merge remote-tracking branch 'upstream/master' into systemd ... Conflicts: maintainers/scripts/ec2/create-ebs-amis.py		2012-12-17 13:03:56 -05:00
..
config	Merge remote-tracking branch 'upstream/master' into systemd	2012-12-17 13:03:56 -05:00
hardware	Add new 'hardware.cpu.amd.updateMicrocode' option.	2012-09-11 18:44:37 +02:00
installer	Merge remote-tracking branch 'upstream/master' into systemd	2012-12-17 13:03:56 -05:00
misc	Hackery to build against both the nixpkgs master and systemd branch	2012-12-13 15:04:09 +01:00
profiles	In headless deployments, don't start agetty on the console	2012-10-30 13:53:36 +01:00
programs	update nixos channel path	2012-12-14 18:24:41 +01:00
security	Merge remote-tracking branch 'origin/master' into systemd	2012-11-30 16:12:04 +01:00
services	Zabbix agent: RemainAfterExit=true seems to give more reliable restarts, cannot completely figure out why, as Type=forking should be enough.	2012-12-11 20:54:19 +01:00
system	Merge remote-tracking branch 'upstream/master' into systemd	2012-12-17 13:03:56 -05:00
tasks	Refactor common unionfs-fuse initrd prep into a separate module	2012-12-16 12:33:36 -05:00
testing	test-instrumentation.nix: Don't start agetty on hvc0	2012-11-12 09:19:25 +01:00
virtualisation	Merge remote-tracking branch 'upstream/master' into systemd	2012-12-17 13:03:56 -05:00
module-list.nix	Refactor common unionfs-fuse initrd prep into a separate module	2012-12-16 12:33:36 -05:00
rename.nix	Adding a rename line for rt73 -> ralink.	2012-08-11 14:54:43 +02:00