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

3516 Commits

Author SHA1 Message Date
Thomas Waldmann ededb6f2c8 fix crc32 compile error, fixes #2039 2017-01-14 05:06:15 +01:00
TW 9575edc446 Merge pull request #2036 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0-maint
 2017-01-14 03:59:34 +01:00
Thomas Waldmann e431d60cc5 merge 1.0-maint into master 
# Conflicts:
#	src/borg/crypto.pyx
#	src/borg/hashindex.pyx
#	src/borg/helpers.py
#	src/borg/platform/__init__.py
#	src/borg/platform/darwin.pyx
#	src/borg/platform/freebsd.pyx
#	src/borg/platform/linux.pyx
#	src/borg/remote.py
 2017-01-14 03:07:11 +01:00
enkore 82fd84e865 Merge pull request #2035 from ThomasWaldmann/docs-backup-from-stdin 
borg create: document how to backup stdin, fixes #2013
 2017-01-14 00:27:18 +01:00
enkore a488d39245 Merge pull request #2034 from ThomasWaldmann/api-version-number-spacing 
API_VERSION: use numberspaces, fixes #2023
 2017-01-14 00:26:47 +01:00
enkore 68dd61f808 Merge pull request #2033 from ThomasWaldmann/require-succeeding-osx-tests 
travis: require succeeding OS X tests, fixes #2028
 2017-01-14 00:26:29 +01:00
TW 986740b7fe Merge pull request #2032 from ThomasWaldmann/fix-pipe-write 
borg serve: fix transmission data loss of pipe writes, fixes #1268
 2017-01-13 22:55:05 +01:00
Thomas Waldmann 022c1288e7 borg create: document how to backup stdin, fixes #2013 2017-01-13 21:49:06 +01:00
Thomas Waldmann 1c854b9f60 API_VERSION: use numberspaces, fixes #2023 
like '<numberspace>_<version>', e.g. '1.0_01' for version 01 (used in 1.0 maintenance branch).

this avoids overlap and accidental collisions between different release branches.
 2017-01-13 21:24:17 +01:00
Thomas Waldmann 93d7d3c1db travis: require succeeding OS X tests, fixes #2028 2017-01-13 21:03:18 +01:00
Thomas Waldmann 941b8d7778 borg serve: fix transmission data loss of pipe writes, fixes #1268 
This problem was found on cygwin/windows due to its small pipe buffer size of 64kiB.

Due to that, bigger (like >64kiB) writes are always only partially done and os.write() returns
the amount of data that was actually sent. the code previously did not use that return value
and assumed that always all is sent, which led to a loss of the remainder of transmission data
and usually some "unexpected RPC data format" error on the client side.

Neither Linux nor *BSD ever do partial writes on blocking pipes, unless interrupted by a
signal, in which case serve() would terminate.
 2017-01-13 20:40:40 +01:00
enkore e946556064 Merge pull request #2031 from enkore/f/inforeg 
fix performance regression in "borg info ::archive"
 2017-01-13 19:52:38 +01:00
Marian Beermann 5cc292c52c fix performance regression in "borg info ::archive" 2017-01-13 15:33:38 +01:00
enkore 173852ed23 Merge pull request #2027 from enkore/issue/2026 
crc: disable CLMUL version due to clang bugs.
 2017-01-13 02:42:01 +01:00
Marian Beermann f482c32423 crc32: sb8: remove some unneeded stuff, use hashindex byteorder detection 2017-01-13 00:33:34 +01:00
Marian Beermann 292fb1e2a9 crc: disable nice CLMUL version due to clang bugs. 2017-01-12 21:30:37 +01:00
enkore ff69f6e6ae Merge pull request #2021 from enkore/merge/1.0-maint 
Merge/1.0 maint
 2017-01-12 17:36:03 +01:00
Marian Beermann 7923088ff9 check: pick better insufficent archives matched warning from TW's merge 2017-01-12 17:04:51 +01:00
Marian Beermann 1d40675ce4 merge fixup 2017-01-12 15:04:57 +01:00
Marian Beermann ecad0ed53a Merge branch '1.0-maint' into merge/1.0-maint 
# Conflicts: ... everywhere ...
#	.travis.yml
#	Vagrantfile
#	borg/testsuite/key.py
#	docs/changes.rst
#	docs/quickstart.rst
#	docs/usage.rst
#	docs/usage/upgrade.rst.inc
#	src/borg/archive.py
#	src/borg/archiver.py
#	src/borg/crypto.pyx
#	src/borg/helpers.py
#	src/borg/key.py
#	src/borg/remote.py
#	src/borg/repository.py
#	src/borg/testsuite/archive.py
#	src/borg/testsuite/archiver.py
#	src/borg/testsuite/crypto.py
#	src/borg/testsuite/helpers.py
#	src/borg/testsuite/repository.py
#	src/borg/upgrader.py
#	tox.ini
 2017-01-12 15:01:41 +01:00
enkore 9c42a75831 Merge pull request #2020 from enkore/f/tamdocs 
upgrade: fix incorrect title levels
 2017-01-12 14:31:11 +01:00
Marian Beermann 3c0a903e8a upgrade: fix incorrect title levels 2017-01-12 14:30:23 +01:00
TW 9e692d47b1 Merge pull request #2019 from ThomasWaldmann/update-1.0-changes 
Update 1.0 changes
 2017-01-12 03:39:51 +01:00
Thomas Waldmann 6603133344 update CHANGES (1.0-maint) 2017-01-12 03:37:52 +01:00
enkore 207a211391 Merge pull request #2018 from enkore/f/debug-remote 
F/debug remote
 2017-01-12 03:18:54 +01:00
Marian Beermann 2d2bff9bf6 remote: include unknown data in error message 
this makes it far, far easier to diagnose issues like an account being
locked:

Got unexpected RPC data format from server:
This account is currently not available.
 2017-01-12 03:18:35 +01:00
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
Marian Beermann b6fa8629db remote: log SSH command line at debug level 2017-01-12 02:39:56 +01:00
TW b206aa771c Merge pull request #2016 from ThomasWaldmann/fix-typos 
fix typos
 2017-01-12 02:27:13 +01:00
Thomas Waldmann 01090d2d40 fix typos 
taken from debian package, thanks to danny edel and lintian for finding these.
 2017-01-12 02:25:41 +01:00
enkore 53aaee3519 Merge pull request #2000 from enkore/issue/1997 
check: fail if single archive does not exist
 2017-01-12 02:08:38 +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 6075d547e9 Merge pull request #1991 from ThomasWaldmann/fix-pytest-xdist 
use pytest-xdist to parallelize testing
 2017-01-12 02:06:26 +01:00
Marian Beermann fe6b03a72d check: print non-exit-code warning if --last or --prefix aren't fulfilled 2017-01-12 02:04:44 +01:00
TW 1c1a289c8a Merge pull request #2008 from ThomasWaldmann/update-1.0-changes 
update CHANGES (1.0-maint)
 2017-01-12 01:31:26 +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
TW c5172646ab Merge pull request #2006 from sherbang/patch-1 
Docs: language clarification - VM backup FAQ
 2017-01-08 01:39:48 +01:00
sherbang 33be583920 Update faq.rst 2017-01-07 18:48:48 -05:00
Thomas Waldmann 69b816fe76 update CHANGES (1.0-maint) 2017-01-07 23:12:27 +01:00
TW 6cb6984433 Merge pull request #2005 from ThomasWaldmann/fix-travis-osx-builds 
travis: fix OS X based testing
 2017-01-07 02:29:41 +01:00
Thomas Waldmann e119042f4c travis: install py36 on OS X 2017-01-06 07:12:29 +01:00
Thomas Waldmann 370cb1f19a travis: fix osxfuse install 2017-01-06 07:12:29 +01:00
Thomas Waldmann 2938a5f6fb work around spurious log level related test fail when using pytest-xdist 2017-01-06 05:48:50 +01:00
Thomas Waldmann a1d223cec0 always setup module level "logger" in the same way 
this is a cleanup change, found this while trying to find out why
borg_cmd spuriously does not have INFO loglevel when testing with
pytest-xdist.

the cleanup did NOT help with this, but is at least a cleanup.
 2017-01-06 05:48:50 +01:00
Thomas Waldmann 5ed6d21302 parallel testing: fix issue related to non-reproducible set / dict order 2017-01-06 05:48:50 +01:00