Merge branch 'master' of ssh://propellor.branchable.com

3 files changed, 33 insertions, 0 deletions

diff --git a/doc/forum/Bug_with_Sbuild/comment_4_6777722f9a18832aad1f195e78e6ac03._comment b/doc/forum/Bug_with_Sbuild/comment_4_6777722f9a18832aad1f195e78e6ac03._comment
new file mode 100644
index 00000000..70d3dc47
--- /dev/null
+++ b/doc/forum/Bug_with_Sbuild/comment_4_6777722f9a18832aad1f195e78e6ac03._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="spwhitton"
+ subject="comment 4"
+ date="2016-06-21T08:57:02Z"
+ content="""
+I found a way to do it and committed it to the branch we're discussing [[elsewhere|todo/merge_request:_changes_to_Reboot.hs/]].
+"""]]
diff --git a/doc/forum/use_withUmask_in_a_property/comment_4_13bfe4aec95f5e72f4f61b764fb29a5a._comment b/doc/forum/use_withUmask_in_a_property/comment_4_13bfe4aec95f5e72f4f61b764fb29a5a._comment
new file mode 100644
index 00000000..0a45cdfc
--- /dev/null
+++ b/doc/forum/use_withUmask_in_a_property/comment_4_13bfe4aec95f5e72f4f61b764fb29a5a._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="gueux"
+ subject="comment 4"
+ date="2016-06-21T09:42:31Z"
+ content="""
+Is there a equivalent of `withUmask` for `withFile`? The latter seems harder to interact with...
+"""]]
diff --git a/doc/todo/merge_request:_changes_to_Reboot.hs/comment_10_d353b81063c5343b452f8c6e0fce5586._comment b/doc/todo/merge_request:_changes_to_Reboot.hs/comment_10_d353b81063c5343b452f8c6e0fce5586._comment
new file mode 100644
index 00000000..04b02aea
--- /dev/null
+++ b/doc/todo/merge_request:_changes_to_Reboot.hs/comment_10_d353b81063c5343b452f8c6e0fce5586._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="spwhitton"
+ subject="reboot branch merges cleanly"
+ date="2016-06-21T09:20:40Z"
+ content="""
+Ah, very nice :)
+
+I reverted my GHC 6 commits and the merge with your master branch is now clean.
+
+Some changelog text you can use:
+
+- 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.
+- Improved Sbuild module haddock.
+- Ccache.hasCache now sets the setgid bit on the cache directory, as ccache requires.
+"""]]