mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity
4,875 Commits 9 Branches 137 Tags 57 MiB
Commit Graph

4875 Commits

Author SHA1 Message Date
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
TW b2d4ba6ba6
Merge pull request #3496 from ThomasWaldmann/borg-init-existing-repo-1.1 
Correct some confusing error messages from `borg init`, fixes #3465
 2017-12-29 10:06:50 +01:00
Thomas Waldmann 6da0a12a86 update CHANGES (1.1) 2017-12-29 03:28:07 +01:00
Josh Holland 5138db20e2 Correct some confusing error messages from `borg init` (#3485) 
init: more clear exception messages for borg create, fixes #3465

also: refactor

(cherry picked from commit 9f400633f2)
 2017-12-29 03:18:02 +01:00
TW 5ab238df2b
Merge pull request #3486 from ThomasWaldmann/fix-getfqdn-1.1 
fix getfqdn (1.1)
 2017-12-28 23:45:25 +01:00
Thomas Waldmann d11c9e9b15 use patched version of socket.getfqdn(), fixes #3471 
(cherry picked from commit 9b0d0f3127)
 2017-12-25 06:05:53 +01:00
Thomas Waldmann f00e9de492 refactor/move hostname/fqdn related funcs, see #3471 
- move stuff to platform.base (should be platform independent according
  to the docs).
- bump platform API version
- parseformat: import fqdn from platform instead of recomputing it

This is not yet fixing #3471, just a preparation for it.

(cherry picked from commit 5e4df7782b)
 2017-12-25 06:05:52 +01:00
TW 128ed2da47
Merge pull request #3482 from ThomasWaldmann/fix-borg-init-quota-1.1 
borg init: use given --storage-quota for local repo, fixes #3470 (1.1)
 2017-12-23 21:54:08 +01:00
TW b500ab7509
Merge pull request #3480 from ThomasWaldmann/borg-base-dir-1.1 
added BORG_BASE_DIR, s/get_home_dir/get_base_dir/g, docs, fixes #3338
 2017-12-23 19:53:16 +01:00
Thomas Waldmann b101717818 borg init: use given --storage-quota for local repo, fixes #3470 
(cherry picked from commit d1cdc1451f)
 2017-12-23 19:26:52 +01:00
TW 9ae4e0dcb1
Merge pull request #3479 from ThomasWaldmann/quote-repo-path-1.1 
Properly quote repo path in `borg init` output (1.1)
 2017-12-23 19:24:46 +01:00
TW 0f3661a130
Merge pull request #3478 from ThomasWaldmann/fix-docs-typo-1.1 
docs: Fix missing apostrophe
 2017-12-23 18:19:47 +01:00
Thomas Waldmann 28baa78595 added BORG_BASE_DIR, s/get_home_dir/get_base_dir/g, docs, fixes #3338 
also: sorted env var docs by level
(cherry picked from commit c5a339384e)
 2017-12-23 18:09:16 +01:00
Josh Holland b263888a4f Properly quote repo path in `borg init` output 
Instead of printing this invalid command:

    borg upgrade --disable-tam '/path/test'repo'

print this valid one:

    borg upgrade --disable-tam '/path/test'"'"'repo'

(cherry picked from commit e780660830)
 2017-12-23 17:49:18 +01:00
Josh Holland 9f7ed7fcec docs: Fix missing apostrophe 
(cherry picked from commit 95a05dbbf1)
 2017-12-23 17:47:00 +01:00