Commit Graph

4889 Commits

Author SHA1 Message Date
enkore ac0b9fbdae sec docs: explicitly note what happens OUTSIDE the attack model
(cherry picked from commit 674ce72fda)
2018-03-17 21:09:13 +01:00
TW d7ec959ce2
Merge pull request #3692 from ThomasWaldmann/diff-deleted-empty
fix diff deleted/empty, fixes #3688
2018-03-17 19:41:38 +01:00
Thomas Waldmann c3b7d7b60c consider an empty file as different to a non-existing file, fixes #3688 2018-03-17 18:50:51 +01:00
Thomas Waldmann 01beee37a7 add test for issue #3688
(cherry picked from commit 0a46d3330c)
2018-03-17 18:30:44 +01:00
TW 767dccb24c
Merge pull request #3668 from anowlcalledjosh/docs-formatting-backport-1.1
Improve formatting of GPG output in documentation (backport to 1.1)
2018-03-05 17:39:09 +01:00
Josh Holland b0c441660f
Improve formatting of GPG output in documentation
(cherry picked from commit 9f2f4132ec)
2018-03-05 15:15:52 +00:00
TW bf6961f5bd
Merge pull request #3660 from dragetd/draget-backport-1.1-doc
Add docs on how to verify a signed release
2018-03-03 00:20:24 +01:00
Michael Gajda 17bb3f8f98 Add docs on how to verify a signed release
Short howto on using gpg to verify a signed binary release.
Fixes #3634
2018-03-02 22:11:49 +01:00
TW 1f84b0810d
Merge pull request #3654 from miek/backport-3633
Backport #3633 to 1.1-maint
2018-03-02 19:34:05 +01:00
TW 2e40f70911
Merge pull request #3655 from miek/backport-3607
Backport #3607 to 1.1-maint
2018-03-02 17:53:03 +01:00
TW 8f2b62522d
Merge pull request #3656 from miek/backport-3604
Backport #3604 to 1.1-maint
2018-03-02 16:53:14 +01:00
Thomas Waldmann d8cfd91b15 fix borg create never showing M status
the problem was that the upper layer code did not have enough information
about the file, whether it is known or not - and thus, could not decide
correctly whether status should be M)odified or A)dded.

now, file_known_and_unchanged method returns an additional "known"
boolean to fix this.

also: add comment about files cache loading in cache_mode='r'
2018-03-02 15:44:41 +00:00
Thomas Waldmann 44ba0bb319 fix erroneously skipped zstd compressor tests, fixes #3606 2018-03-02 15:44:33 +00:00
Thomas Waldmann 8eb2fee7a0 Revert "travis osx: run brew update first, fixes #3527"
This reverts commit e4828078bb.
2018-03-02 15:44:22 +00:00
TW fd79b90ec0
Merge pull request #3651 from miek/backport-3589
Backport #3589 to 1.1-maint
2018-03-02 16:08:57 +01:00
Rémi Oudin 4e50dc6d94 Link to offline documentation
Add a link to the offline documentation in README.rst.
Refers https://github.com/borgbackup/borg/issues/3502
2018-03-02 14:21:08 +00:00
TW 9135c73b1f
Merge pull request #3652 from miek/backport-3596-and-3600
Backport #3596 and #3600 to 1.1-maint
2018-03-02 13:08:33 +01:00
TW a3d1eb26c4
Merge pull request #3650 from miek/backport-3580-to-1.1-maint
Backport 3580 to 1.1-maint
2018-03-02 13:00:57 +01:00
TW ccfeb44822
Merge pull request #3649 from miek/backport-3520-to-maint-1.1
Backport 3520 to 1.1-maint

Chunk seed is generated per /repository/.
2018-03-02 01:13:25 +01:00
SanskritFritz c446d8d802 Using spaces instead of tabs for indentation. 2018-03-01 23:25:43 +00:00
Viktor Bale 4eeb969157 Fixed tab completion problem where a space is always added after path even when it shouldn't 2018-03-01 23:21:50 +00:00
Rémi Oudin fe807046b4 Better formatting of CPU usage documentation
This is now displayed as a list, with bold fonts for each bullet.
Refers https://github.com/borgbackup/borg/issues/3554
2018-03-01 23:20:02 +00:00
Thomas Waldmann 6e02e2e452 do .h file content checks in binary mode, fixes #3544
we can't know the encoding header file authors will use,
so using binary for our simple checks is the safest way.
2018-02-28 15:51:27 +00:00
Gregor Kleen 183966549f Chunk seed is generated per /repository/ 2018-02-28 15:46:23 +00:00
TW b602612a40
Merge pull request #3555 from leo-b/1.1-maint-archive-metadata
add chunker_params to borg archive info (--json)
2018-01-29 17:52:26 +01:00
Alexander 'Leo' Bergolth 42a9053771 add chunker_params to json docs 2018-01-22 09:05:24 +01:00
TW 19032f72da
Merge pull request #3567 from ThomasWaldmann/files-cache-exception-handling-1.1
files cache: improve exception handling, fixes #3553 (1.1)
2018-01-21 12:19:53 +01:00
Thomas Waldmann 21742faf26 fixup: tests
(cherry picked from commit 835fede85f)
2018-01-20 17:13:45 +01:00
Thomas Waldmann 423ec4ba1e files cache: improve exception handling, fixes #3553
now deals with:
- corrupted files cache (truncated or modified not by borg)
- inaccessible/unreadable files cache
- missing files cache

The latter fix is not sufficient, the cache transaction processing
would still stumble over expected, but missing files in the cache.
2018-01-20 06:36:54 +01:00
TW 3dd8d4097a
Merge pull request #3565 from leo-b/1.1-maint-scandir2
remove unneeded sort from scandir_generic()
2018-01-19 19:18:34 +01:00
Alexander 'Leo' Bergolth b5fbeed6ed remove unneeded sort from scandir_generic() 2018-01-19 17:38:15 +01:00
TW 37a475e3ac
Merge pull request #3558 from leo-b/1.1-maint-scandir
ignore exceptions in scandir_inorder() caused by an implicit stat()
2018-01-19 11:55:58 +01:00
Alexander 'Leo' Bergolth 9163e064fd ignore exceptions in scandir_inorder() caused by an implicit stat() 2018-01-18 16:25:50 +01:00
Alexander 'Leo' Bergolth 7e75cc3080 add chunker_params to archive info (at least to json output) 2018-01-18 11:32:40 +01:00
TW d3a5484e2c
Merge pull request #3531 from SanskritFritz/1.1-maint
Updated zsh completions for borg 1.1.4
2018-01-17 14:03:04 +01:00
TW e6071e090e
Merge pull request #3529 from ThomasWaldmann/fix-travis-brew-1.1
travis osx: run brew update first, fixes #3527 (1.1)
2018-01-11 11:21:56 +01:00
SanskritFritz c23ee3dbea Updated zsh completions for borg 1.1.4 2018-01-10 22:30:06 +01:00
Thomas Waldmann 4223a90d5e travis osx: run brew update first, fixes #3527
suggested as work around on the travis issue about this ruby version
issue (wanted: 2.3, having: 2.0).

(cherry picked from commit e4828078bb)
2018-01-10 19:03:40 +01:00
TW 5e007ea7a6
Merge pull request #3524 from ThomasWaldmann/fixate-msgpack-requirement-1.1
require msgpack >= 0.4.6 and < 0.5.0 (1.1-maint).
2018-01-10 16:02:55 +01:00
Thomas Waldmann fa924c64ff require msgpack >= 0.4.6 and < 0.5.0.
maybe this is the easiest way for us to deal with msgpack compatibility.

0.5.0 release had some troubles:
- FutureWarning on stderr disturbing other output there, breaking tests
- pip install -U broken due to a pip issue with the transisition pkg
  which was needed due to the package rename (ImportError for msgpack)
- some linux dists not packaging the transition pkg
- dropped py34 support/testing
2018-01-10 08:15:40 +01:00
TW ff52f24a81
Merge pull request #3516 from LocutusOfBorg/no-shebang-1.1-maint
borg shell completion: remove shebang, useless because scripts are sourced
2018-01-08 12:52:36 +01:00
Gianfranco Costamagna 34fc988ef6 borg shell completion: remove shebang, useless because scripts are sourced 2018-01-07 18:53:57 +01:00
TW 3549736ec4
Merge pull request #3505 from Abogical/new-year-1.1-maint
Celebrate the new year with 1.1-maint
2018-01-03 02:49:09 +01:00
Abogical 46692c139a Revert copyright year change in shellpattern 2018-01-02 19:44:53 +02:00
Abogical f3791144ef Happy new year! 2018-01-02 19:44:35 +02:00
TW e30a75ee0d
Merge pull request #3498 from borgbackup/rel114
Release 1.1.4
2017-12-30 13:11:04 +01:00
Thomas Waldmann 9b4202fd48 build_usage 2017-12-30 01:58:32 +01:00
Thomas Waldmann b8f6e47b42 build_man 2017-12-30 01:57:18 +01:00
Thomas Waldmann a44b5bb273 update CHANGES (1.1)
bump version to borg 1.1.4 "34c3 edition"
2017-12-30 01:00:41 +01:00
TW d1c4215082
Merge pull request #3483 from ThomasWaldmann/update-changes-1.1
update CHANGES (1.1)
2017-12-30 00:36:19 +01:00