Commit graph

5862 commits

Author SHA1 Message Date
AJ Jordan
a80cbfc249
Fix manifest-timestamp path
This is a backport of PR #6016 to the 1.1-maint branch.
2021-10-18 18:49:06 -04:00
TW
bed422efcf
Merge pull request #6008 from oxiedi/fix-libc-zsh-completion_1.1-maint
Fix Zsh completion for $BORG_LIBC
2021-10-11 21:28:44 +02:00
oxiedi
1640375272 Fix Zsh completion for $BORG_LIBC 2021-10-11 13:21:00 +05:00
TW
d6d5aba5c4
Merge pull request #6005 from ahtaarra/patch-2
docs: fix the broken link to .nix file
2021-10-09 21:28:21 +02:00
ahtaarra
9d351e5830
docs: fix the broken link to .nix file
(This incorporates the same change as this PR: https://github.com/borgbackup/borg/pull/5999
Fix the link to .nix file in the docs which has been broken since this change: e570d93519
2021-10-09 17:45:19 +06:00
TW
123da801a9
Merge pull request #6003 from KN4CK3R/backport-5985
Backport do not require BORG_CONFIG_DIR if BORG_{SECURITY,KEYS}_DIR are set (#5985)
2021-10-08 09:41:00 +02:00
TW
ad0b139783 do not require BORG_CONFIG_DIR if BORG_{SECURITY,KEYS}_DIR are set 2021-10-08 08:44:49 +02:00
TW
edc1cdf74b
Merge pull request #5923 from oxiedi/update-shell-completions_1.1.17
Update shell completions to 1.1.17
2021-10-08 07:24:14 +02:00
TW
79265614ca
Merge pull request #5970 from remyabel/backport
Backport docs fixes #5958 #5959
2021-08-28 15:53:01 +02:00
Tommy Nguyen
0f39bcc70f
Backport documentation changes
Includes changes for #5958 #5959
2021-08-26 17:26:00 -04:00
TW
abbc8a6cb9
Merge pull request #5957 from Gu1nness/5734-1.1-maint
Use an exception catching to avoid a stack trace
2021-08-14 11:04:03 +02:00
Guinness
c12fc71bf5
Use an exception catching to avoid a stack trace
When exclude files are used, this can trigger a stack trace if the file
does not exist. Instead exit nicely without the stacktrace.
2021-08-14 10:12:31 +02:00
remyabel
f3db40c57f
docs: update referenced freebsd version (#5945) (#5949)
docs: fix binary build freebsd/macOS version, fixes #5942

backports of #5945
2021-08-06 12:35:09 +02:00
TW
3044a343cf
Merge pull request #5936 from ThomasWaldmann/remove-fuse-version-check-1.1
fuse: remove unneeded version check and compat code
2021-07-20 23:30:33 +02:00
Thomas Waldmann
92a4ab4616 fuse: remove unneeded version check and compat code
we require >= 1.3 now anyway, see setup.py.
2021-07-20 23:10:37 +02:00
TW
b4b1c403a1
Merge pull request #5930 from remyabel/docs-fix-warnings
docs: fix sphinx warnings
2021-07-18 23:26:10 +02:00
TW
6b8c369903
Merge pull request #5931 from remyabel/docs-fix-duplicate
docs: remove duplicate faq entries
2021-07-18 23:23:19 +02:00
Tommy Nguyen
928347bd89
docs: remove duplicate faq entries
Fixes: #5926
2021-07-17 23:38:10 -04:00
Tommy Nguyen
d91c34f113
docs: fix sphinx warnings
Fixes: #5919
2021-07-17 23:32:46 -04:00
TW
8336b000f3
Merge pull request #5920 from ThomasWaldmann/rel1117
release 1.1.17
2021-07-12 23:00:42 +02:00
oxiedi
fa64949ef7 update shell completions to 1.1.17 2021-07-13 01:44:26 +05:00
oxiedi
6371e739b7 update shell completions to 1.1.16 2021-07-13 01:17:40 +05:00
Thomas Waldmann
fdc0743457 build_man 2021-07-12 19:27:52 +02:00
Thomas Waldmann
fc3b7fdad1 build_usage 2021-07-12 19:27:10 +02:00
Thomas Waldmann
6c0a09d12c vagrant: fix run_tests for py310 2021-07-12 19:23:03 +02:00
Thomas Waldmann
9db019f75c update CHANGES 2021-07-12 16:02:38 +02:00
TW
051b0bd2f6
Merge pull request #5915 from ThomasWaldmann/vagrant-updates3
more vagrant updates
2021-07-12 12:16:25 +02:00
Thomas Waldmann
9c73928bbb vagrant: more RAM for openindiana upgrade plan resolver
it just hangs (swaps?) if there is too little RAM.
2021-07-12 02:10:09 +02:00
Thomas Waldmann
77b4a6e953 use latest Cython 0.29.23 for py310 compat fixes 2021-07-12 02:08:35 +02:00
TW
777f64ffc5
Merge pull request #5914 from ThomasWaldmann/vagrant-updates2
more vagrant updates
2021-07-12 00:30:16 +02:00
Thomas Waldmann
d95fd0fbea python 3.10 officially supported
we test on py310-dev on github CI since a while and now also on the vagrant machines, so it should work ok.
2021-07-12 00:12:04 +02:00
Thomas Waldmann
bac8e6b82b vagrant: add py3.7.11 for binary build, also add 3.10-dev 2021-07-12 00:08:26 +02:00
TW
a6fba6e1a9
Merge pull request #5912 from ThomasWaldmann/update-changes
update CHANGES
2021-07-11 23:45:58 +02:00
TW
ab531ae113
Merge pull request #5913 from ThomasWaldmann/vagrant-updates
vagrant: fix install_pyenv
2021-07-11 23:45:45 +02:00
Thomas Waldmann
7c03ca5f76 vagrant: fix install_pyenv
same code as in master now.
2021-07-11 23:44:05 +02:00
Thomas Waldmann
86c40b6bde update CHANGES 2021-07-11 23:35:52 +02:00
TW
a460f25674
Merge pull request #5910 from ThomasWaldmann/upgrade-vagrant-netbsd
vagrant: use generic/netbsd9 box, copied from master branch
2021-07-11 22:37:24 +02:00
Thomas Waldmann
d423176b33 vagrant: use generic/netbsd9 box, copied from master branch 2021-07-11 15:44:25 +02:00
TW
7cfb03a67c
Merge pull request #5904 from ThomasWaldmann/fix-pyinstaller-dir-mode-1.1
fix pyinstaller detection for dir-mode, fixes #5897
2021-07-10 23:56:47 +02:00
TW
d84e7f4254
Merge pull request #5906 from ThomasWaldmann/benchmark-cleanup-1.1
benchmark: make sure cleanup happens even on exceptions, fixes #5630
2021-07-10 23:24:38 +02:00
TW
ec42bc4dcb
Merge pull request #5905 from ThomasWaldmann/docs-key-hint-1.1
docs: clarify "you will need key and passphrase" borg init warning, fixes #4622
2021-07-10 23:12:04 +02:00
Bruno Behnken
3233b9397e benchmark: make sure cleanup happens even on exceptions, fixes #5630 2021-07-10 23:04:56 +02:00
Thomas Waldmann
5546c3c31e docs: clarify "you will need key and passphrase" borg init warning, fixes #4622 2021-07-10 22:53:04 +02:00
Thomas Waldmann
d94d8e0e9a fix pyinstaller detection for dir-mode, fixes #5897
"running under pyinstaller" detection is now as recommended by the pyinstaller docs.
2021-07-10 22:35:48 +02:00
TW
17f5c13281
Merge pull request #5902 from ThomasWaldmann/pull-chroot-problematic-1.1
docs: pull mode: add some warnings, fixes #5827
2021-07-10 18:33:14 +02:00
Thomas Waldmann
949ca47652 fix typo 2021-07-10 18:32:06 +02:00
Thomas Waldmann
344b833e37 docs: pull mode: add some warnings, fixes #5827 2021-07-10 18:29:44 +02:00
TW
0fb8c8b822
Merge pull request #5898 from KN4CK3R/backport-5885
Backport master to 1.1-maint (#5880)
2021-07-10 17:50:42 +02:00
Dmitry Astapov
8b0e0da4dc docs: mention tar --compare (#5880)
docs: mention tar --compare (compare archive to fs files)
2021-07-04 20:08:25 +02:00
TW
be131db5b1
Merge pull request #5884 from ThomasWaldmann/allow-files-cache-size-1.1
Allow --files-cache=size
2021-07-03 23:23:39 +02:00