John Ericson f2017c40ae Merge remote-tracking branch 'upstream/master' into staging		2018-05-14 22:53:10 -04:00
..
config	treewide: isArm -> isAarch32	2018-04-25 15:28:55 -04: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	nixos/tests: prevent stateVersion warnings in eval	2018-05-15 00:22:35 +02:00
misc	nixos: version: produce a warning when no system.nixos.stateVersion is explicitly set	2018-05-12 19:27:10 +00:00
profiles	base profile: add mkpasswd to system packages	2018-05-09 00:20:02 +03:00
programs	nixos: rename system.{stateVersion,defaultChannel} -> system.nixos.\1	2018-05-12 19:27:09 +00:00
security	manual: Clarify that limits.conf doesn't apply to systemd services. (#40267)	2018-05-12 17:44:57 +02:00
services	Merge remote-tracking branch 'upstream/master' into staging	2018-05-14 13:31:20 -04:00
system	Merge pull request #40416 from oxij/os/fix-some-types	2018-05-13 18:15:55 +02:00
tasks	lxd: 2.16 -> 3.0.0	2018-04-14 11:02:24 +01:00
testing	nixos/tests: set default stateVersion in test VMs	2018-05-14 00:01:15 +02:00
virtualisation	nixos: rename system.{stateVersion,defaultChannel} -> system.nixos.\1	2018-05-12 19:27:09 +00:00
module-list.nix	Merge pull request #39099 from teto/qemu_agent	2018-05-10 01:22:52 +02:00
rename.nix	nixos: rename system.{stateVersion,defaultChannel} -> system.nixos.\1	2018-05-12 19:27:09 +00:00