summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-10-23 01:27:51 -0400
committerJoey Hess2015-10-23 01:27:51 -0400
commiteca865628c2cae8996854d596dfee0dea4ef17c2 (patch)
treed30425bf0630173bc17be40c5ca8283b2a3897f6 /debian
parentbf25cb287bcec0b85f64c90a88a4556291efe74a (diff)
parent1a55d09b5452f07508d4624b632e9a54782dbee8 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 49c866bc..051a9748 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+propellor (2.11.1) UNRELEASED; urgency=medium
+
+ * The DiskImage module can now make bootable images using grub.
+ * Add a ChrootTarball chroot type, for using pre-built tarballs
+ as chroots. Thanks, Ben Boeckel.
+
+ -- Joey Hess <id@joeyh.name> Thu, 22 Oct 2015 20:24:18 -0400
+
propellor (2.11.0) unstable; urgency=medium
* Rewrote Propellor.Property.ControlHeir one more time, renaming it to