summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-06-05 17:21:57 -0400
committerJoey Hess2014-06-05 17:21:57 -0400
commit4fdd1b9ea4082c4005ded2bf650f349090da6aea (patch)
treefbb7c4dcae57d33af755c90890678390e41b450e /debian
parentf8bad2726760268f1daae2a3329be5db310727b8 (diff)
parentc2dd54d167cafe471360fd1e470bd6e50e2ee36b (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
1 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 9d9c9f0b..0c06f50c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,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 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.
+ when propellor is used to manage DNS for the domain.
+ * Apt.stdSourcesList no longer needs a suite to be specified.
* Added --dump to dump out a field of a host's privdata. Useful for editing
it.
+ * 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