summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-12-21 21:40:26 -0400
committerJoey Hess2014-12-21 21:40:26 -0400
commit6d56dbd35ae10c3c51f14e441fd9f90a0c53c92f (patch)
tree7cd7ed5ac175282183e6466d354904420af18e16 /debian
parenta68bd830acfa90949462189e47783a4d257739bc (diff)
parentdc36a98fc159794395512ff2ae78eb8e0acb0ea5 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index af964774..3524cb00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+propellor (1.2.2) UNRELEASED; urgency=medium
+
+ * Revert ensureProperty warning message, too many false positives in places
+ where Info is correctly propigated. Better approach needed.
+
+ -- Joey Hess <id@joeyh.name> Sun, 21 Dec 2014 21:11:45 -0400
+
propellor (1.2.1) unstable; urgency=medium
* Added CryptPassword to PrivDataField, for password hashes as produced