Franz Pletz b116fa5ff2 Merge branch 'master' into staging		2017-07-28 16:08:30 +02:00
..
config	change swap.randomEncryption config option to "coercedTo" for backwards compatibility	2017-07-26 20:57:10 +03:00
hardware	mcelog: use .service file from upstream	2017-07-27 13:06:20 +08:00
i18n/input-method
installer	nix: 1.11.12 -> 1.11.13	2017-07-18 10:54:01 +02:00
misc	Merge pull request #26907 from volth/vault	2017-07-11 15:02:29 -04:00
profiles	all-hardware.nix: add VMware support. (#27430)	2017-07-17 02:38:10 +02:00
programs	Merge pull request #26761 from gnidorah/master3	2017-07-26 22:44:45 +08:00
security	nixos/auditd: init at 2.7.6 (#27261)	2017-07-09 17:59:09 +01:00
service-managers
services	Merge branch 'master' into staging	2017-07-28 16:08:30 +02:00
system	swap: extend randomEncryption to plainOpen and ability to select cipher	2017-07-26 20:57:10 +03:00
tasks	zfs, spl: 0.6.5.11 -> 0.7.0	2017-07-27 19:00:54 +02:00
testing
virtualisation	docker module: fix autoPrune.enable description	2017-07-21 16:54:40 +02:00
module-list.nix	Merge pull request #27347 from cstrahan/osquery-new	2017-07-24 21:51:10 -04:00
rename.nix	zfs, spl: 0.6.5.11 -> 0.7.0	2017-07-27 19:00:54 +02:00