summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-06-05 17:35:36 -0400
committerJoey Hess <joey@kitenet.net>2014-06-05 17:35:36 -0400
commit48b8d1c1858c7bac582fc9669af5700ecb1b0ca4 (patch)
tree1b292d3a6d7cf3d0f5d67d1294fafd5026127ca8
parentf4f43fc9350000b105e9067161ce523783c3970d (diff)
parent2db48021f0bb77325b06d78457445dead8b897c4 (diff)
Merge branch 'joeyconfig'debian/0.6.0
-rw-r--r--debian/changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 087c7eb9..046cf607 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.