summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-12-14 15:24:21 -0400
committerJoey Hess2014-12-14 15:24:21 -0400
commitfbf9cc6f2b66ba5e56993a239e511cc6bae4af54 (patch)
treecd00a21d0a0b27603374a04f3de505facee651ec /debian
parent9d06d2f835143c308bc409b7dc737c4292d9bc72 (diff)
parent71723ca09f369ccf96462cef1e0200e1615677d1 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c28989d5..46d28b53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+propellor (1.2.1) UNRELEASED; urgency=medium
+
+ * Added CryptPassword to PrivDataField, for password hashes as produced
+ by crypt(3).
+ * User.hasPassword and User.hasSomePassword will now use either
+ a CryptPassword or a Password from privdata, depending on which is set.
+
+ -- Joey Hess <id@joeyh.name> Sun, 14 Dec 2014 13:51:01 -0400
+
propellor (1.2.0) unstable; urgency=medium
* Display a warning when ensureProperty is used on a property which has