summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2016-02-26 10:55:21 -0400
committerJoey Hess2016-02-26 10:55:21 -0400
commit071921d11056527fc307e243b603bfc83d49555e (patch)
tree1fb5c8f7aeb4a1babbd13ca0622333fa5e8d5433 /debian
parentc716d1a0d4b18737b133ba9cc23c97388f72f5c0 (diff)
parent0cba8dec39447f030c0f765d1d84a1c2466b9bfc (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
1 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index cf74edaf..76367e6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,16 @@ propellor (2.16.0) UNRELEASED; urgency=medium
different backup properties, to avoid concurrent jobs fighting over
scarce resources (particularly memory). Other jobs block on a lock
file.
- * Removed references to *buntu from code and documentation because of
- an unfortunate trademark use policy.
+ * Removed references to a Debian derivative from code and documentation
+ because of an unfortunate trademark use policy.
http://joeyh.name/blog/entry/trademark_nonsense/
- * That included changing a data constructor to "FooBuntu", an API change.
+ * That included changing a data constructor to "Buntish", an API change.
+ * Firewall: add InIFace/OutIFace Rules, add Source/Destination Rules,
+ add CustomTarget, and more improvements.
+ Thanks, FĂ©lix Sipma.
+ * Firewall.rule: Now takes a Table parameter. (API change)
+ * Ssh.authorizedKey: Fix bug preventing it from working when the
+ authorized_keys file does not yet exist.
-- Joey Hess <id@joeyh.name> Fri, 19 Feb 2016 11:29:53 -0400