summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-09-23 14:29:24 -0400
committerJoey Hess2015-09-23 14:29:24 -0400
commit4365588bf102e034318092e0a8b2aa357f35addc (patch)
tree8232c7847348b17670fe8ccd0fd0b31edfebde88
parent27bede6e0a20d7c9629144ba1882c4409de8f2ca (diff)
parentb424c3da63bdb9897123b4481a02e087590bcc03 (diff)
Merge branch 'joeyconfig'
-rw-r--r--debian/changelog7
1 files changed, 1 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 91f78be7..32eb7aea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-propellor (2.8.1) UNRELEASED; urgency=medium
-
- * Added --rm-key.
-
- -- Joey Hess <id@joeyh.name> Wed, 23 Sep 2015 13:50:01 -0400
-
propellor (2.8.0) unstable; urgency=medium
* Added Propellor.Property.Rsync.
@@ -32,6 +26,7 @@ propellor (2.8.0) unstable; urgency=medium
* Allow storing arbitrary ByteStrings in PrivData, extracted using
privDataByteString.
* Added Aiccu module, contributed by Jelmer Vernooij.
+ * Added --rm-key.
-- Joey Hess <id@joeyh.name> Tue, 22 Sep 2015 19:35:07 -0400