summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-03-12 20:09:31 -0400
committerJoey Hess2015-03-12 20:09:31 -0400
commitbc60edb50a41a326e64ccd25a36ac27215ef4b9e (patch)
tree7e3849d123da0dda038d2f5e3d88025635beb444 /debian
parent4f101f8560e29958b08306c86a1b8ca34e8a6a0c (diff)
parent9292cee1aa7967a0afe6d45f58a6d429d1b56b55 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f15affbf..9ac8c3f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+propellor (2.2.1) unstable; urgency=medium
+
+ * userScriptProperty now passes --shell /bin/sh, so it can be used
+ even for users with nonstandard shells.
+ * Fix bug in docker propellor shim setup introduced in last release,
+ which broke provisioning of new docker containers.
+
+ -- Joey Hess <id@joeyh.name> Thu, 12 Mar 2015 20:08:34 -0400
+
propellor (2.2.0) unstable; urgency=medium
* When running shimmed (eg in a docker container),