Shea Levy 75ec5c609e Merge remote-tracking branch 'upstream/master' into systemd ... Conflicts: maintainers/scripts/ec2/create-ebs-amis.py		2012-12-17 13:03:56 -05:00
..
amazon-config.nix	* Install a configuration.nix in the AMI.	2010-07-15 11:09:30 +00:00
amazon-image.nix	amazon-image: use unionfs-fuse instead of aufs	2012-12-16 13:16:17 -05:00
ec2-data.nix	Merge remote-tracking branch 'origin/master' into systemd	2012-11-30 16:12:04 +01:00
libvirtd.nix	Update libvirt for systemd	2012-10-26 16:22:19 +02:00
nova-config.nix	* Generate a nova.conf file.	2011-05-11 13:52:49 +00:00
nova-image.nix	nova-image.nix: Replace the commented-out aufs mount with a commented-out unionfs-fuse mount	2012-12-16 13:31:44 -05:00
nova.nix	* Fix bad default.	2012-02-23 21:25:22 +00:00
qemu-vm.nix	Merge remote-tracking branch 'upstream/master' into systemd	2012-12-17 13:03:56 -05:00
virtualbox-guest.nix	Use optionalAttrs	2012-10-10 16:49:47 -04:00
virtualbox-image.nix	Turn fileSystems into an attribute set	2012-11-02 18:02:12 +01:00
xen-dom0.nix	* Fix some references to dhclient.	2012-03-22 13:02:42 +00:00
xen-domU.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00