summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-04-08 02:06:37 -0400
committerJoey Hess2014-04-08 02:07:11 -0400
commit634cf61c7989f5d20bccd822e2fd568ccbdef947 (patch)
tree29ff196aea04f736dcc4f3b4e3929bdefe754c71 /debian
parent3068fdbe78cb86a9272b1ce5200653f5331fb173 (diff)
parent7ba62a28b51dc5826c70d3be0ab41825e31d28ac (diff)
Merge branch 'joeyconfig'
Conflicts: Propellor/Property/Docker.hs
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 f4eadd22..e2f955b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+propellor (0.2.3) UNRELEASED; urgency=medium
+
+ * docker: Fix laziness bug that caused running containers to be
+ unnecessarily stopped and committed.
+ * Add locking so only one propellor can run at a time on a host.
+ * docker: When running as effective init inside container, wait on zombies.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 04 Apr 2014 15:58:03 -0400
+
propellor (0.2.2) unstable; urgency=medium
* Now supports provisioning docker containers with architecture/libraries