summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-10-21 19:47:15 -0400
committerJoey Hess2015-10-21 19:47:15 -0400
commiteac925f398df39791fe8236f8f8329627761f2e9 (patch)
tree9ce53fbad65c36bb39b5102e6792219b43c34d2a /debian
parent2d1671d5ebdd3c7f99d4023ac621137938505962 (diff)
parent85f08ee913a77c16ba4d264581b1240468c4ebb2 (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 f8bd5ad5..b4819dd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+propellor (2.11.0) UNRELEASED; urgency=medium
+
+ * Rewrote Propellor.Property.ControlHeir one more time, renaming it to
+ Propellor.Property.Conductor.
+ * Added Ssh properties to remove authorized_keys and known_hosts lines.
+
+ -- Joey Hess <id@joeyh.name> Wed, 21 Oct 2015 15:06:26 -0400
+
propellor (2.10.0) unstable; urgency=medium
* The Propellor.Property.Spin added in the last release is replaced