path: root/doc
diff options
authorspwhitton2016-06-21 09:20:40 +0000
committeradmin2016-06-21 09:20:40 +0000
commit4786f7edff935bff050e1f04cd71283100f2c723 (patch)
tree5077c13ee6dc6114982f8cbb35883ea6c0d2e71c /doc
parent1f7a8ba74c1f5f37c38fe5734734601d68168185 (diff)
Added a comment: reboot branch merges cleanly
Diffstat (limited to 'doc')
1 files changed, 19 insertions, 0 deletions
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.