summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--doc/todo/merge_request:_changes_to_Reboot.hs.mdwn2
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6d64552c..1ce1cbc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ propellor (3.0.6) UNRELEASED; urgency=medium
* Sbuild: Add keyringInsecurelyGenerated which is useful on throwaway
build VMs.
Thanks, Sean Whitton
+ * Added Propellor.Property.SiteSpecific.Exoscale.
+ Thanks, Sean Whitton
+ * Property.Reboot: Added toDistroKernel and toKernelNewerThan.
+ Thanks, Sean Whitton
-- 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..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]]