summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog15
-rw-r--r--doc/todo/merge_request:_changes_to_Reboot.hs.mdwn2
2 files changed, 17 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index be668ea5..6219b3e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,8 +33,23 @@ propellor (3.1.0) UNRELEASED; urgency=medium
* File: Write privdata files in binary rather than text, which avoids
failure when they do not contain valid unicode.
Thanks, Andrew Schurman
+
+ [ Sean Whitton ]
* Generalized fileProperty can now operate on a file as either a series
of lines, or a ByteString.
+ * New info property Schroot.useOverlays to indicate whether you want schroots
+ set up by propellor to use the Linux kernel's OverlayFS.
+ * Schroot.overlaysInTmpfs sets Schroot.useOverlays info property.
+ * If you have indicated that you want schroots to use OverlayFS and the
+ current kernel does not support it, Sbuild.built will attempt to reboot
+ into a kernel that does, or fail if it can't find one.
+ * Sbuild.built will no longer add duplicate `aliases=UNRELEASED,sid...` lines
+ to more than one schroot config. It will not remove any such lines that the
+ previous version of propellor added, though.
+ * Sbuild.keypairGenerated works around Debian bug #792100 by creating the
+ directory /root/.gnupg in advance.
+ * Ccache.hasCache now sets the setgid bit on the cache directory, as
+ ccache requires.
-- Joey Hess <id@joeyh.name> Fri, 10 Jun 2016 14:59:44 -0400
diff --git a/doc/todo/merge_request:_changes_to_Reboot.hs.mdwn b/doc/todo/merge_request:_changes_to_Reboot.hs.mdwn
index a18b21e5..a6dec37b 100644
--- a/doc/todo/merge_request:_changes_to_Reboot.hs.mdwn
+++ b/doc/todo/merge_request:_changes_to_Reboot.hs.mdwn
@@ -3,3 +3,5 @@ Please consider merging branch `reboot` of repo `https://git.spwhitton.name/prop
- Factor out reboot code in `Propellor.Property.SiteSpecific.DigitalOcean` into `Propellor.Property.Reboot`
- Add `Propellor.Property.Reboot.toKernelNewerThan`.
- Add `Propellor.Property.SiteSpecific.Exoscale`
+
+> [[done]]; all changes merged --[[Joey]]