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

4853 Commits

Author SHA1 Message Date
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
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
TW 20f9f5e39c
Merge pull request #3476 from SanskritFritz/1.1-maint 
zstd compression method added to fish/bash completions
 2017-12-23 16:30:13 +01:00
SanskritFritz 7fc29b58f8 zstd compression method 2017-12-23 10:48:02 +01:00
TW 14e5ec4d51
Merge pull request #3468 from SanskritFritz/1.1-maint 
Updated bash/fish completions for borg 1.1.3
 2017-12-23 01:19:36 +01:00
SanskritFritz f229ec537b Updated bash/fish completions for borg 1.1.3 2017-12-22 00:37:55 +01:00
TW 601a34731c
Merge pull request #3463 from ThomasWaldmann/docs-lz4-b2-zstd-1.1 
docs update for lz4 b2 zstd changes (1.1)
 2017-12-20 04:37:00 +01:00
Thomas Waldmann 7d2f7be414 add zstd to compression help 
(cherry picked from commit 3d32407e9a)
 2017-12-20 03:25:18 +01:00
Thomas Waldmann ce7864f6a6 readme / docs: mention zstd 
(cherry picked from commit 2588e50f0b)
 2017-12-20 03:25:04 +01:00
Thomas Waldmann 182c0fa636 update requirements and install docs about bundled lz4 and zstd 
(cherry picked from commit 061321b668)
 2017-12-20 03:24:48 +01:00
TW 5acf9eefa9
Merge pull request #3462 from ThomasWaldmann/update-changes-1.1 
update CHANGES (1.1-maint)
 2017-12-20 03:22:05 +01:00
Thomas Waldmann 6043d8b257 update CHANGES (1.1-maint) 2017-12-19 02:19:15 +01:00
TW ba1708d30e
Merge pull request #3458 from ThomasWaldmann/blake2-ext-building-1.1 
crypto.low_level ext building (blake2 part, 1.1)
 2017-12-18 07:28:48 +01:00
Thomas Waldmann 1bdaffc62c crypto.low_level extension: build blake2 like zstd, see #3415 
(cherry picked from commit 4a2fec32b6)
 2017-12-18 04:29:33 +01:00
Thomas Waldmann 0118b939d9 update blake2 reference impl file (cosmetic) 
only whitespace changes.

(cherry picked from commit b56f6cdbc0)
 2017-12-18 04:26:15 +01:00
Thomas Waldmann ba38d5199b move blake2 files to subdir ref/ (as seen in orig. repo) 
(cherry picked from commit 8924d78d44)
 2017-12-18 04:25:57 +01:00
TW b8a7238622
Merge pull request #3456 from ThomasWaldmann/lz4-ext-building-1.1 
compress ext building (lz4 part, 1.1)
 2017-12-18 04:14:25 +01:00
TW ed31ea2516
Merge pull request #3455 from ThomasWaldmann/borg-delete-removing-security-dir-1.1 
also delete security dir when deleting a repo, fixes #3427 (1.1)
 2017-12-18 04:12:48 +01:00
Thomas Waldmann 21ba3ff63c fix lz4 deprecation warning, require lz4 >= 1.7.0 (r129) 
as we bundle lz4 1.8.0 now, platforms not having a recent liblz4 can
now just use the bundled code.

(cherry picked from commit fe48caf853)
 2017-12-18 02:47:44 +01:00
Thomas Waldmann 83603acd48 rename BORG_LZ4_PREFIX env var to BORG_LIBLZ4_PREFIX 
consistency:
we also have BORG_LIBB2_PREFIX and BORG_LIBZSTD_PREFIX.

(cherry picked from commit 9b6924d27f)
 2017-12-18 02:42:03 +01:00
Thomas Waldmann 7d8ec62b50 compress extension: build lz4 like zstd, see #3415 
(cherry picked from commit 73a70082c2)
 2017-12-18 02:41:30 +01:00
Thomas Waldmann 49f76a1e32 bundle lz4 1.8.0 src code, license 
(cherry picked from commit c8b2820225)
 2017-12-18 02:38:52 +01:00
Thomas Waldmann 1d64e5c227 also delete security dir when deleting a repo, fixes #3427 
(cherry picked from commit 8f772437f2)
 2017-12-18 01:55:11 +01:00
TW 696f2a2d25
Merge pull request #3445 from ThomasWaldmann/check-hangs-fix 
fix for borg check --repair malfunction, #3444 (1.1-maint)
 2017-12-16 21:59:44 +01:00