summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--doc/todo/merge_request:_Sbuild.keypairInsecurelyGenerated.mdwn2
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index fffc22cb..6d64552c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
propellor (3.0.6) UNRELEASED; urgency=medium
* Switch letsencrypt to certbot package name.
+ * Sbuild: Add keyringInsecurelyGenerated which is useful on throwaway
+ build VMs.
+ Thanks, Sean Whitton
-- Joey Hess <id@joeyh.name> Fri, 10 Jun 2016 14:59:44 -0400
diff --git a/doc/todo/merge_request:_Sbuild.keypairInsecurelyGenerated.mdwn b/doc/todo/merge_request:_Sbuild.keypairInsecurelyGenerated.mdwn
index c8f3a195..7a22e976 100644
--- a/doc/todo/merge_request:_Sbuild.keypairInsecurelyGenerated.mdwn
+++ b/doc/todo/merge_request:_Sbuild.keypairInsecurelyGenerated.mdwn
@@ -1,3 +1,5 @@
Please consider merging branch `insecure-sbuild-keygen` from repo `https://git.spwhitton.name/propellor`.
- Adds `Sbuild.keyringInsecurelyGenerated` which is useful on throwaway build VMs
+
+> [[merged|done]] --[[Joey]]