summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-12-09 00:34:57 -0400
committerJoey Hess2014-12-09 00:34:57 -0400
commit4f309c5cd61a6af5ecade56099ed605c0be72920 (patch)
tree30586152f2eb484c4de93b373b1694a84c278cbb /debian
parent914f762d01f43b31920667049362d6f56f61c121 (diff)
parentb22201e36b608ba38f4d741268d04e7de3a966b8 (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 68564473..c28989d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ propellor (1.2.0) unstable; urgency=medium
* Removed boolProperty; instead the new toResult can be used. (API change)
* Include Propellor.Property.OS, which was accidentially left out of the
cabal file in the last release.
+ * Fix Apache.siteEnabled to update the config file and reload apache when
+ configuration has changed.
-- Joey Hess <id@joeyh.name> Tue, 09 Dec 2014 00:05:09 -0400