summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorJoey Hess2014-10-31 10:21:37 -0400
committerJoey Hess2014-10-31 10:21:37 -0400
commit43935ae7b06b44223cae4dc32613cd6751bc80f4 (patch)
tree424120ce08af0bce3f1409a31861daf84b40951a /debian/changelog
parentb1c4ddff04b5571e7ec60e7bfb014db76fd48eae (diff)
parentca06c64bae82322348a07a97de924a1758a38b8f (diff)
Merge branch 'joeyconfig'
Conflicts: privdata/privdata.gpg
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog7
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c580b3ba..804d54c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+propellor (0.9.2) UNRELEASED; urgency=medium
+
+ * Added nginx module, contributed by FĂ©lix Sipma.
+ * Added firewall module, contributed by Arnaud Bailly.
+
+ -- Joey Hess <joeyh@debian.org> Thu, 30 Oct 2014 16:36:06 -0400
+
propellor (0.9.1) unstable; urgency=medium
* Docker: Add ability to control when containers restart.