summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTW <tw@waldmann-edv.de>2023-12-23 19:14:34 +0100
committerGitHub <noreply@github.com>2023-12-23 19:14:34 +0100
commitfe624870f526a80ec905f06cc2aa2dc41e496b8d (patch)
tree890fecf9d371978edfdf2571a30e64fbea6731f5
parentc675a00aa5163005af6997f5bcaa966166f9fcc0 (diff)
parent05fa6fcab221107892e51029f02ffb14142fbc4a (diff)
Merge pull request #7974 from ThomasWaldmann/sync-with-1.2-maint1.4.0dev0
sync with 1.2-maint
-rw-r--r--docs/changes.rst8
-rw-r--r--docs/usage/notes.rst2
2 files changed, 7 insertions, 3 deletions
diff --git a/docs/changes.rst b/docs/changes.rst
index d770cecaf..c3fcb6a9b 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -390,8 +390,12 @@ Fixes:
- check/compact: fix spurious reappearance of orphan chunks since borg 1.2, #6687 -
this consists of 2 fixes:
- - for existing chunks: check --repair: recreate shadow index, #6687
- - for newly created chunks: update shadow index when doing a double-put, #5661
+ - for existing chunks: check --repair: recreate shadow index, #7897 #6687
+ - for newly created chunks: update shadow index when doing a double-put, #7896 #5661
+
+ If you have experienced issue #6687, you may want to run borg check --repair
+ after upgrading to borg 1.2.7 to recreate the shadow index and get rid of the
+ issue for existing chunks.
- LockRoster.modify: no KeyError if element was already gone, #7937
- create --X-from-command: run subcommands with a clean environment, #7916
- list --sort-by: support "archive" as alias of "name", #7873
diff --git a/docs/usage/notes.rst b/docs/usage/notes.rst
index 8805f2765..e2d8a4953 100644
--- a/docs/usage/notes.rst
+++ b/docs/usage/notes.rst
@@ -14,7 +14,7 @@ resource usage (RAM and disk space) as the amount of resources needed is
(also) determined by the total amount of chunks in the repository (see
:ref:`cache-memory-usage` for details).
-``--chunker-params=buzhash,10,23,16,4095`` results in a fine-grained deduplication|
+``--chunker-params=buzhash,10,23,16,4095`` results in a fine-grained deduplication
and creates a big amount of chunks and thus uses a lot of resources to manage
them. This is good for relatively small data volumes and if the machine has a
good amount of free RAM and disk space.