summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2020-08-27 21:55:06 -0400
committerJoey Hess2020-08-27 21:55:06 -0400
commit3b6ca3e092a66f18a4cdc197aecaffc64f6cb510 (patch)
tree095c260051c1d7de1e527e698b619b4f16bbf8a1
parent7bce1bf2a9312f141321ef9c5f167e45f6b64da8 (diff)
merged nicolas/borg-umask
-rw-r--r--debian/changelog4
-rw-r--r--doc/todo/Add_Borg.UseUmask.mdwn2
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 849d132d..f2505f06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ propellor (5.12) UNRELEASED; urgency=medium
* Added libghc-type-errors-dev to debian/control recommends, and
install it if available when bootstrapping propellor.
+ * Borg: add UseUmask to BorgRepoOpt.
+ Thanks, Nicolas Schodet
+ * Borg: use "{now}" instead of $(date ...)
+ Thanks, Nicolas Schodet
-- Joey Hess <id@joeyh.name> Thu, 27 Aug 2020 20:57:48 -0400
diff --git a/doc/todo/Add_Borg.UseUmask.mdwn b/doc/todo/Add_Borg.UseUmask.mdwn
index 64ca8b83..74284c2d 100644
--- a/doc/todo/Add_Borg.UseUmask.mdwn
+++ b/doc/todo/Add_Borg.UseUmask.mdwn
@@ -7,3 +7,5 @@ Please fetch branch `borg-umask` at `http://git.ni.fr.eu.org/nicolas/propellor.g
As a side change, I use `{now}` instead of a call to `$(date …)`, I think it's more idiomatic for borg usage.
Tested with stretch and buster.
+
+> [[merged|done]] thanks for the contribution. --[[Joey]]