summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-11-23 18:49:33 -0400
committerJoey Hess2014-11-23 18:49:33 -0400
commitf14749c1ccdaeb76beee74381d86f0bc4bc76b09 (patch)
tree5cff1489e97022ad227de288e470acfe0128df5c /debian
parent1695f5c678e5e64bc12252ee5b8ed75d1c5b5c49 (diff)
parent9d975e9ee4c44782da0815fb161ea8676dbf559c (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e70e6a9b..683fed21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ propellor (1.1.0) UNRELEASED; urgency=medium
* hasSomePassword and hasPassword now default to using the name of the
host as the Context for the password. To specify a different context,
use hasSomePassword' and hasPassword' (API change)
+ * Add --merge, to combine multiple --spin commits into a single, more useful
+ commit.
-- Joey Hess <joeyh@debian.org> Sat, 22 Nov 2014 00:12:35 -0400