summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-08 02:08:33 -0400
committerJoey Hess2014-04-08 02:08:33 -0400
commit07a071ac7f5b2f71e376a9a1a78a84a6bf02129b (patch)
tree59cd32aec312c618ed6e38b18eb002e1b3993937
parent634cf61c7989f5d20bccd822e2fd568ccbdef947 (diff)
parent2e6f7c1b5d04db4841cb748150f2a99dcfba5617 (diff)
Merge branch 'joeyconfig'
-rw-r--r--debian/changelog6
-rw-r--r--propellor.cabal2
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index e2f955b0..4455768f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
-propellor (0.2.3) UNRELEASED; urgency=medium
+propellor (0.2.3) unstable; 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.
+ * docker: Added support for configuring shared volumes and linked
+ containers.
- -- Joey Hess <joeyh@debian.org> Fri, 04 Apr 2014 15:58:03 -0400
+ -- Joey Hess <joeyh@debian.org> Tue, 08 Apr 2014 02:07:37 -0400
propellor (0.2.2) unstable; urgency=medium
diff --git a/propellor.cabal b/propellor.cabal
index e67c41cb..0869ef58 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 0.2.2
+Version: 0.2.3
Cabal-Version: >= 1.6
License: GPL
Maintainer: Joey Hess <joey@kitenet.net>