summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess2016-06-13 18:13:59 -0400
committerJoey Hess2016-06-13 18:13:59 -0400
commit7d6a78c317a8382044682a2183b6524d0d8c050a (patch)
tree50ab57d3311c3e51b28471343deee46805e7a07a /doc
parent5c55d3d4153e571876383e53dc43e38ce767e34d (diff)
merged
Diffstat (limited to 'doc')
-rw-r--r--doc/todo/merge_request:_changes_to_Reboot.hs.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/todo/merge_request:_changes_to_Reboot.hs.mdwn b/doc/todo/merge_request:_changes_to_Reboot.hs.mdwn
index a18b21e5..4f6fb1cc 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`
+
+> [[merged|done]] --[[Joey]]