summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-11-08 15:56:36 -0400
committerJoey Hess2014-11-08 15:56:36 -0400
commitf38cd7c6a571ed7ee08a379a4aef9827f54d471f (patch)
tree2e3ef71aa606c07fe1d5ec6fa4168fe4f45f57a4 /debian
parent3313e6ab76eab90e44630a354f4b09e0e4aaec82 (diff)
parent9755b761bb46bc40d19a2723165424a1f8a27cbb (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 5b45c853..8c79d519 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ propellor (0.9.2) UNRELEASED; urgency=medium
* Added nginx module, contributed by FĂ©lix Sipma.
* Added firewall module, contributed by Arnaud Bailly.
* Apache: Fix daemon reload when enabling a new module or site.
+ * Docker: Stop using docker.io; that was a compat symlink in
+ the Debian package which has been removed in docker.io 1.3.1~dfsg1-2.
-- Joey Hess <joeyh@debian.org> Thu, 30 Oct 2014 16:36:06 -0400