summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2016-08-28 14:38:23 -0400
committerJoey Hess2016-08-28 14:38:23 -0400
commitfdc46a15905b264af50d7312f6706114de36d1e8 (patch)
treebbb447fc317a05e6056582fdce8beaa3564bc582
parent28d684b313a1cb2754ad72ca6f6364dce4b631f6 (diff)
merged spwhitton/sbuild-0.71.0
-rw-r--r--debian/changelog3
-rw-r--r--doc/todo/updates_for_sbuild_0.70.0-1.mdwn2
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index ce8d6e41..20a6a336 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,9 @@ propellor (3.1.2) UNRELEASED; urgency=medium
[ Joey Hess ]
* Ssh.knownHost: Bug fix: Only fix up the owner of the known_hosts
file after it exists.
- * Sbuild.keypairInsecurelyGenerated: Improved to be more robust.
- Thanks, Sean Whitton.
[ Sean Whitton ]
+ * Sbuild.keypairInsecurelyGenerated: Improved to be more robust.
* Pass --allow-unrelated-histories to git merge when run with git 2.9 or
newer. This fixes the /usr/bin/propellor wrapper with this version of git.
* Sbuild.built & Sbuild.builtFor no longer require Sbuild.keypairGenerated.
diff --git a/doc/todo/updates_for_sbuild_0.70.0-1.mdwn b/doc/todo/updates_for_sbuild_0.70.0-1.mdwn
index 30c2694c..58659643 100644
--- a/doc/todo/updates_for_sbuild_0.70.0-1.mdwn
+++ b/doc/todo/updates_for_sbuild_0.70.0-1.mdwn
@@ -17,3 +17,5 @@ It turns out that the apt keypair is only needed if you're trying to build for s
I'd like feedback on these two options before preparing a patch for one of them.
--spwhitton
+
+> [[merged|done]] --[[Joey]]