summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-06-09 12:32:15 -0400
committerJoey Hess2014-06-09 12:32:15 -0400
commit70ab611efdaf8bba6becc42bef14cc47486d42a6 (patch)
treea5e5a10056601d90a1a3fbd05c397bf484540c8a /debian
parentbfbe9b2c9aaeb4e923dedabd8f5a53a0bd9c3acf (diff)
parenta1341ccb315a98e407a25bf25411759b6f8f58d2 (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 046cf607..b8db1680 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+propellor (0.7.0) UNRELEASED; urgency=medium
+
+ * combineProperties no longer stops when a property fails; now it continues
+ trying to satisfy all properties on the list before propigating the
+ failure.
+ * Attr is renamed to Info.
+
+ -- Joey Hess <joeyh@debian.org> Sat, 07 Jun 2014 00:12:44 -0400
+
propellor (0.6.0) unstable; urgency=medium
* Docker containers now propagate DNS attributes out to the host they're