Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-06-05 17:35:36 -04:00
commit 48b8d1c185
1 changed files with 1 additions and 1 deletions

2
debian/changelog vendored
View File

@ -1,6 +1,6 @@
propellor (0.6.0) unstable; urgency=medium
* Docker containers now propigate DNS attributes out to the host they're
* Docker containers now propagate 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 be added to a DNS round-robin,
when propellor is used to manage DNS for the domain.