summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-10-26 15:38:29 -0400
committerJoey Hess2015-10-26 15:38:29 -0400
commit886705bf83f6351bc6740a07918f668cb8639197 (patch)
tree9d68eb5a2447ab91ef967d55305cde3b3859b8a6 /debian
parent103da27d1be08ed31574c9eb37632ac260963afe (diff)
parent77e3a5d4d968f3567b1b8e62996e0e6c803ab642 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog15
1 files changed, 15 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f4be6655..c5eef2c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+propellor (2.13.0) UNRELEASED; urgency=medium
+
+ * Added Propellor.Property.Concurrent for concurrent properties.
+ (Note that no output multiplexing is currently done.)
+ * Various property combinators that combined a RevertableProperty
+ with a non-revertable property used to yield a RevertableProperty.
+ This was a bug, because the combined property could not be fully
+ reverted in many cases. Fixed by making the combined property
+ instead be a Property HasInfo.
+ * combineWith now takes an additional parameter to control how revert
+ actions are combined (API change).
+ * Add File.isCopyOf. Thanks, Per Olofsson.
+
+ -- Joey Hess <id@joeyh.name> Sat, 24 Oct 2015 15:16:45 -0400
+
propellor (2.12.0) unstable; urgency=medium
* The DiskImage module can now make bootable images using grub.