Robin Gloster 9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv		2016-02-07 11:17:57 +00:00
..
config	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-02-07 11:17:57 +00:00
hardware	wis_go7007: remove dead package & module	2016-01-11 00:16:01 +01:00
installer	filesystems: use list of strings for fs options	2016-02-06 19:48:30 +00:00
misc	nixos: update-locatedb - harden via systemd (#7220)	2016-01-23 20:44:30 +00:00
profiles	wpa_supplicant service: jobs -> systemd.services	2016-01-06 03:58:39 +00:00
programs	Revert "Merge #12357: nixos docs: show references to packages"	2016-02-03 12:16:33 +01:00
security	Fix some references to deprecated /etc/ssl/certs/ca-bundle.crt	2016-01-29 02:32:05 +01:00
services	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-02-07 11:17:57 +00:00
system	filesystems: use list of strings for fs options	2016-02-06 19:48:30 +00:00
tasks	filesystems: use list of strings for fs options	2016-02-06 19:48:30 +00:00
testing	NixOS tests: Increase hung_task_timeout_secs	2016-01-04 16:53:42 +01:00
virtualisation	filesystems: use list of strings for fs options	2016-02-06 19:48:30 +00:00
module-list.nix	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-02-07 11:17:57 +00:00
rename.nix	nixos: Document "jobs" option removal	2016-01-14 13:08:56 +01:00