Frederik Rietdijk 55c54d2bfe Merge master into staging		2018-06-02 12:46:44 +02:00
..
config	iproute2: module to create rt_table file & co	2018-05-15 21:55:04 +09:00
hardware	Merge branch 'master' into staging	2018-04-10 09:13:36 +02:00
i18n/input-method	Added cross-references to NixOS manual	2018-04-12 09:39:14 +10:00
installer	Merge branch 'plat-fix-for-merge-2' into master	2018-06-01 20:08:08 +03:00
misc	Revert "nixpkgs module: Fix defaulting of localSystem and system"	2018-05-31 15:55:36 -04:00
profiles	nixos/installer: Drop dmraid	2018-05-25 01:55:51 +03:00
programs	zsh: only do promptInit when TERM!=dumb	2018-05-31 12:34:16 -04:00
security	manual: Clarify that limits.conf doesn't apply to systemd services. (#40267)	2018-05-12 17:44:57 +02:00
services	Merge pull request #34886 from leenaars/mortyproxy	2018-06-02 10:26:09 +00:00
system	nixos/systemd-timesyncd: use the correct server list (#40919)	2018-05-24 22:44:04 +00:00
tasks	nixos.modules.tasks.swraid: add raid10 module to initrd	2018-05-28 23:49:35 +03:00
testing	nixos/tests: set default stateVersion in test VMs	2018-05-14 00:01:15 +02:00
virtualisation	Merge pull request #40242 from gnidorah/gvt	2018-06-01 23:14:35 -04:00
module-list.nix	Merge master into staging	2018-06-02 12:46:44 +02:00
rename.nix	kubernetes: update to 1.10	2018-05-25 10:50:36 +02:00