summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-07-21 11:13:24 -0400
committerJoey Hess2015-07-21 11:13:24 -0400
commitc35f77a72494bcceffbd1911ae2be25ad8af6a14 (patch)
treed5efb6d3295e214787715d1bf2ff0f7b97392773 /debian
parenta8de302eab9ae9916a67b52ddcae2e4e2df1fe7a (diff)
parent2932c2b420a3d059be0faecc2113f19f1171af4d (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 6b411fa2..055035bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ propellor (2.7.0) UNRELEASED; urgency=medium
* Ssh.permitRootLogin type changed to allow configuring WithoutPassword
and ForcedCommandsOnly (API change)
* setSshdConfig type changed, and setSshdConfigBool added with old type.
+ * Fix a bug in shim generation code for docker and chroots, that
+ sometimes prevented deployment of docker containers.
-- Joey Hess <id@joeyh.name> Mon, 20 Jul 2015 12:01:38 -0400