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

3447 Commits

Author SHA1 Message Date
TW 745a3a5753 Merge pull request #2017 from enkore/changes/1.1.0b3 
Update 1.1.0b3 CHANGES
 2017-01-12 02:49:53 +01:00
Marian Beermann 10f48dbd0b Update 1.1.0b3 CHANGES 2017-01-12 02:44:04 +01:00
enkore 07049098ee Merge pull request #2014 from enkore/f/hostname->fqdn 
posix: use fully-qualified hostname + node ID
 2017-01-12 02:07:08 +01:00
enkore ded22d3650 Merge pull request #1927 from ThomasWaldmann/blake2b-mac-key-length 
demonstrate mac key length issue
 2017-01-12 01:21:13 +01:00
Marian Beermann 81bd55eec3 key testsuite: update blake2 test data to include padded keys 2017-01-12 01:05:59 +01:00
Marian Beermann b9770c348f posix: use fully-qualified hostname + node ID 
The node ID is usually the 48 bit MAC of the primary network
interface.
 2017-01-12 00:54:17 +01:00
TW 889ee18c85 Merge pull request #2011 from htgoebel/master 
Vagrantfile: Split cygwin packaged to be installed into base and project
 2017-01-09 01:36:35 +01:00
Hartmut Goebel 0f7493299c Vagrantfile: Split cygwin packaged to be installed into base and project. 
The packages which are required for ssh log-in and rsync synchronized
folders to work are separated from those specific for the borg
project. This makes it easier to reuse in other projects.
 2017-01-08 22:16:54 +01:00
enkore 902c423086 Merge pull request #1970 from enkore/f/dbg-speed 
fast crc
 2017-01-02 16:11:11 +01:00
Marian Beermann 56818d1db8 Credit the excellent work of these people in AUTHORS 2017-01-02 15:54:14 +01:00
Marian Beermann 9afebead84 two fast CRC implementations 
CRC slice by 8 for generic CPUs outperforms zlib CRC32 on ppc
and x86 (ARM untested but expected to as well).

PCLMULQDQ derived from Intel's zlib patches outperforms every other
CRC implementation by a huge margin.
 2017-01-02 15:54:14 +01:00
enkore cf19db466d Merge pull request #1989 from Abogical/master 
Happy new year!
 2017-01-01 01:14:08 +01:00
Abogical f043b966da It's 2017 2016-12-31 16:53:30 +02:00
enkore bbddd1a081 Merge pull request #1979 from ThomasWaldmann/no-default-hash 
borg init --encryption - remove default
 2016-12-26 17:01:21 +01:00
Thomas Waldmann 7d48878cfe borg init --encryption - remove default 
use --encryption=repokey for all the tests except if they
have special needs.
 2016-12-24 02:53:44 +01:00
enkore 8ef860284d Merge pull request #1934 from musoke/patch-1 
Update link to security contact
 2016-12-22 15:22:45 +01:00
Marian Beermann fd587331d7 Update link to security contact 
Currently this move was only done in master, so point to latest.
Might be generally a good idea in case it changes and no release was done
since the responsibility changed.
 2016-12-22 15:21:42 +01:00
Nathan Musoke dc5f954afa Update link to security contact 
Information about security contact has moved.
 2016-12-22 15:20:09 +01:00
enkore a4eef67e3b Merge pull request #1912 from Abogical/prune-progress 
Add prune progress display
 2016-12-22 14:57:26 +01:00
enkore 82455a0863 Merge pull request #1969 from enkore/merge/1.0-maint 
Merge 1.0 maint
 2016-12-21 21:55:30 +01:00
Marian Beermann 742bfa33c4 flake8 2016-12-21 00:36:31 +01:00
Marian Beermann a0abc3eb75 CHANGES: move 1.1.0b3 to correct position 2016-12-20 23:26:22 +01:00
Marian Beermann e0e5bc4aa4 ran build_usage 2016-12-20 23:09:28 +01:00
Thomas Waldmann c9cc97e05b CHANGES: fix 1.0.9 release date 2016-12-20 23:06:15 +01:00
Marian Beermann 85cebd0419 Merge branch 'partial-1.0-maint' into merge/1.0-maint 2016-12-20 23:05:44 +01:00
Thomas Waldmann 880578da06 quickstart: use prune with --list 
so people are better aware of what's happening, avoiding pitfalls
with wrong or missing --prefix.
 2016-12-20 23:03:32 +01:00
Marian Beermann 91991988e1 Fix subsubparsers for Python <3.4.3 
This works around http://bugs.python.org/issue9351

Since Debian and Ubuntu ship 3.4.2 and 3.4.0 respectively.
 2016-12-20 23:03:31 +01:00
Marian Beermann f9aefd6a68 Merge commit '343387b36ef' into merge/1.0-maint 
# Conflicts:
#	src/borg/archiver.py
 2016-12-20 23:00:28 +01:00
Marian Beermann df40b3840c upgrade: --disable-tam 
# Conflicts:
#	src/borg/helpers.py
#	src/borg/testsuite/archiver.py
 2016-12-20 22:53:57 +01:00
Marian Beermann c7c8c0fb57 init: explain manifest auth compatibility 
# Conflicts:
#	src/borg/archiver.py
 2016-12-20 22:53:55 +01:00
Marian Beermann d15fb241bd check: handle duplicate archive items neatly 
# Conflicts:
#	src/borg/archive.py
 2016-12-20 22:53:55 +01:00
Marian Beermann 5e1cb9d899 Add tertiary authentication for metadata (TAM) 2016-12-20 22:53:53 +01:00
TW b10426397f Merge pull request #1964 from enkore/issue/1759 
Fix processing of remote ~/ and ~user/ paths
 2016-12-18 21:23:06 +01:00
enkore 343387b36e Merge pull request #1966 from enkore/1.0-340 
Fix subsubparsers for Python <3.4.3
 2016-12-17 18:00:15 +01:00
Marian Beermann e28b470cfb Fix subsubparsers for Python <3.4.3 
This works around http://bugs.python.org/issue9351

Since Debian and Ubuntu ship 3.4.2 and 3.4.0 respectively.
 2016-12-17 18:00:03 +01:00
enkore 0c959cb67a pytest 2 compat 2016-12-17 15:58:51 +01:00
enkore 0b32524cda Merge pull request #1965 from borgbackup/pytest2 
conftest: pytest 2 compat
 2016-12-17 15:58:07 +01:00
enkore af923e261b conftest: pytest 2 compat 2016-12-17 15:23:47 +01:00
Marian Beermann 84d13751d5 Fix processing of remote ~/ and ~user/ paths 2016-12-17 14:33:40 +01:00
enkore 4225009e60 Merge pull request #1955 from ThomasWaldmann/merge-1.0-maint 
merge 1.0-maint
 2016-12-17 14:11:11 +01:00
Marian Beermann 63ce627a35 fix in-file checkpoints when clock jumps 2016-12-17 13:59:37 +01:00
Marian Beermann a9db2a2e55 Merge branch '1.0-maint' into master 
# Conflicts:
#	src/borg/archive.py
#	src/borg/archiver.py
#	src/borg/helpers.py
 2016-12-17 13:26:28 +01:00
Marian Beermann 87f8b2bb64 Merge branch 'merge-1.0-maint' of https://github.com/ThomasWaldmann/borg into ThomasWaldmann-merge-1.0-maint 2016-12-17 13:21:58 +01:00
enkore 49c05719d8 Merge pull request #1941 from enkore/issue/1936 
Fix some clock problems
 2016-12-17 13:20:56 +01:00
Marian Beermann baa8baafdb create: fix duration if --timestamp is given 2016-12-17 12:55:16 +01:00
Marian Beermann 445365b3ff update changes 2016-12-17 12:00:25 +01:00
Marian Beermann f5d6093ccc fix checkpoints when clock jumps 2016-12-17 11:58:26 +01:00
Marian Beermann a8d921a54c base archive timestamps on end time 
The assumption is that if the clock jumps during the Borg run that it
was jump-corrected and is now correct, while the start timestamp would
be wrong.
 2016-12-17 11:58:26 +01:00
Marian Beermann 2dc558a02e fix create progress not updating if clock jumps 2016-12-17 11:58:25 +01:00
Marian Beermann 420c984f05 fix wrong duration if clock jumps during create 2016-12-17 11:58:25 +01:00