diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-06-21 11:12:06 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-06-21 11:12:06 -0400 |
| commit | b8eeb91cc5daa99d16636703fe107113a885c693 (patch) | |
| tree | 5903ad1b5079fcc53033bb2f7d8e81655feefaaa /doc/todo | |
| parent | 2fb5850b8a3c031bfe55a06f2989dc818340bfdd (diff) | |
| parent | 301bc8d250f583c94d770fb1c7ed0377fdbd35e1 (diff) | |
Merge branch 'master' of ssh://propellor.branchable.com
Diffstat (limited to 'doc/todo')
| -rw-r--r-- | doc/todo/merge_request:_changes_to_Reboot.hs/comment_10_d353b81063c5343b452f8c6e0fce5586._comment | 19 |
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. +"""]] |