Vladimír Čunát d4e9fd2a90 Merge recent master into staging ... Hydra: ?compare=1148749 Conflicts (easy): nixos/modules/virtualisation/containers.nix		2014-08-21 15:09:31 +02:00
..
amazon-config.nix
amazon-image.nix	amazon-image.nix: Overwrite busybox swapon	2014-08-01 17:55:37 -04:00
container-config.nix	Containers: Don't remount /	2014-08-18 17:14:43 +02:00
containers.nix	Merge recent master into staging	2014-08-21 15:09:31 +02:00
docker.nix	Upgrade docker to 1.1.2 and add docker module	2014-07-28 21:45:49 +02:00
ec2-data.nix	amazon ec2: Make fetch-ec2-data more robust	2014-08-05 15:12:26 +02:00
google-compute-config.nix
google-compute-image.nix	Google Compute image:	2014-08-01 15:25:50 +02:00
libvirtd.nix
nixos-container.pl	nixos-container: Add command show-host-key	2014-08-19 18:24:48 +02:00
nova-config.nix
nova-image.nix
nova.nix
qemu-opts
qemu-vm.nix	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
virtualbox-guest.nix
virtualbox-image.nix	Fix evaluation in virtualbox-image.nix	2014-08-06 16:25:42 +02:00
xen-dom0.nix
xen-domU.nix