summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-06-05 16:52:45 -0400
committerJoey Hess2014-06-05 16:52:45 -0400
commitf8bad2726760268f1daae2a3329be5db310727b8 (patch)
treeab5db4785fee3c7e919213b97975e727e7724907 /debian
parent383548956354a00cf24323310e9981ccea6a1ddf (diff)
parentdbffd982bac47cebd3fc67e51b46182f7e43392d (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 695ea3fc..9d9c9f0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,12 @@ propellor (0.6.0) UNRELEASED; 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
- it's docked in will automatically become part of a round-robin DNS,
+ it's docked in will automatically be added to a DNS round-robin,
if propellor is used to manage DNS for the domain.
* Propellor's output now includes the hostname being provisioned, or
when provisioning a docker container, the container name.
+ * Added --dump to dump out a field of a host's privdata. Useful for editing
+ it.
-- Joey Hess <joeyh@debian.org> Sat, 31 May 2014 16:41:56 -0400