summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2020-06-05 11:28:32 -0400
committerJoey Hess2020-06-05 11:28:32 -0400
commit73a74d3bc8c6694121c2a5fccf655d556fb0ec86 (patch)
treea91843a868485fed20d28dbb3d72491ac4cfe435 /debian
parent372700ea7c1f96dadfa6076c4759a9d6b8f277af (diff)
fix bad merge of Utility.Process.Shim from git-annex
Fixes display of concurrent output from processes when using Propellor.Property.Conductor. (Reversion introduced in version 5.5.0.) Utility.Process.Shim's whole point is to let propellor differ from git-annex here, but I forgot and copied over git-annex's version.
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 12e78937..b46c4b4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+propellor (5.10.3) UNRELEASED; urgency=medium
+
+ * Fix display of concurrent output from processes when using
+ Propellor.Property.Conductor.
+ (Reversion introduced in version 5.5.0.)
+
+ -- Joey Hess <id@joeyh.name> Fri, 05 Jun 2020 11:26:21 -0400
+
propellor (5.10.2) unstable; urgency=medium
* Fix build with ghc 8.6.3.