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
Thomas Waldmann
853cfb703b
parallelizing tests via pytest-xdist
2017-01-06 05:48:50 +01:00
enkore
e61de12d6e
Merge pull request #1996 from ThomasWaldmann/py36
...
tox / travis: also test on Python 3.6
2017-01-05 13:22:56 +01:00
TW
a84466d70c
Merge pull request #1995 from enkore/f/buffer-exc
...
helpers.Buffer: raise OSError subclass if too much memory shall be al…
2017-01-05 04:50:03 +01:00
Marian Beermann
320a56144f
helpers.Buffer: raise OSError subclass if too much memory is allocd
2017-01-04 19:28:05 +01:00
Marian Beermann
be8e0c89b3
check: fail if single archive does not exist
2017-01-04 19:25:03 +01:00
Thomas Waldmann
c412b86455
vagrant: add Python 3.6.0
2017-01-04 01:06:57 +01:00
Thomas Waldmann
7d4d7e7901
setup.py: add Python 3.6 qualifier
2017-01-04 01:03:18 +01:00
Thomas Waldmann
9533493047
tox / travis: also test on Python 3.6
2017-01-04 00:57:35 +01:00
enkore
73795f5a82
Merge pull request #1994 from enkore/issue/1981
...
Fix upgrade --tam, change-passphrase crashes if not encrypted
2017-01-03 17:31:19 +01:00
Marian Beermann
4b9a9f9b5e
change-passphrase: print key location
2017-01-03 17:16:28 +01:00
Marian Beermann
7519bf8100
fix change-passphrase crashing if repository is not encrypted
2017-01-03 17:15:59 +01:00
Marian Beermann
6a5b3018c1
fix upgrade --tam crashing if repository is not encrypted
2017-01-03 17:15:32 +01:00
enkore
9d7ec9aa0a
Merge pull request #1993 from enkore/issue/1992
...
fix xattrs on ObjectiveFS
2017-01-03 17:11:45 +01:00
