summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-12-07 18:49:43 -0400
committerJoey Hess2014-12-07 18:49:43 -0400
commit21d87341ca75dcc7f33b87c8725738511f224311 (patch)
treed8aaf17b719888c2dbdf838073151b493320876c /debian
parent19a1d6b7ed29aecf1ff3313eac9f07bf762d1dc6 (diff)
parent42a0c832483296fb111279fc3512a3dfd44f2089 (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 0ea27675..827c7986 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+propellor (1.1.1) UNRELEASED; urgency=medium
+
+ * Display a warning when ensureProperty is used on a property which has
+ Info and is so prevented from propigating it.
+
+ -- Joey Hess <id@joeyh.name> Sun, 07 Dec 2014 17:08:55 -0400
+
propellor (1.1.0) unstable; urgency=medium
* --spin target --via relay causes propellor to bounce through an