summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-06-05 17:32:32 -0400
committerJoey Hess2014-06-05 17:32:32 -0400
commitf4f43fc9350000b105e9067161ce523783c3970d (patch)
tree82adbd3745d59fb92131e28344d19ac60a947cc3 /debian
parentdc25de234c822f7139e0e11d0c62760ceca5bf83 (diff)
parent0ba3e77f840ebed3594b85808eabdf390e334945 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 0c06f50c..087c7eb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-propellor (0.6.0) UNRELEASED; urgency=medium
+propellor (0.6.0) unstable; urgency=medium
* Docker containers now propigate DNS attributes out to the host they're
docked in. So if a docker container sets a DNS alias, every container
@@ -10,7 +10,7 @@ propellor (0.6.0) UNRELEASED; urgency=medium
* Propellor's output now includes the hostname being provisioned, or
when provisioning a docker container, the container name.
- -- Joey Hess <joeyh@debian.org> Sat, 31 May 2014 16:41:56 -0400
+ -- Joey Hess <joeyh@debian.org> Thu, 05 Jun 2014 17:32:14 -0400
propellor (0.5.3) unstable; urgency=medium