Thomas Waldmann
70cc201377
Merge branch '1.0-maint' into merge-1.0-maint
2017-01-14 16:53:38 +01:00
Thomas Waldmann
85b3625bca
update CHANGES (1.0-maint)
2017-01-14 16:51:08 +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
Thomas Waldmann
6603133344
update CHANGES (1.0-maint)
2017-01-12 03:37:52 +01:00
Marian Beermann
10f48dbd0b
Update 1.1.0b3 CHANGES
2017-01-12 02:44:04 +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
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
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
Marian Beermann
be8e0c89b3
check: fail if single archive does not exist
2017-01-04 19:25:03 +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
Marian Beermann
3e04fa972a
xattr: only skip file on BufferTooSmallError
...
redefine __str__ to get a proper error message, not ''
2017-01-03 14:25:55 +01:00
Marian Beermann
85e79f96a1
xattr: ignore empty names returned by llistxattr(2) et al
2017-01-03 12:47:42 +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
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
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
Thomas Waldmann
c54a9121ae
CHANGES: fix 1.0.9 release date
2016-12-20 00:49:24 +01:00
Thomas Waldmann
3362ec319e
quickstart: use prune with --list
...
so people are better aware of what's happening, avoiding pitfalls
with wrong or missing --prefix.
2016-12-19 16:06:54 +01:00
Thomas Waldmann
580599cf32
ran build_usage
2016-12-19 04:21:13 +01:00
Thomas Waldmann
1c55930840
ran build_usage
2016-12-17 20:06:41 +01:00
Marian Beermann
f2f50efc28
check: handle duplicate archive items neatly
...
Signed-off-by: Thomas Waldmann <tw@waldmann-edv.de>
2016-12-17 20:06:41 +01:00
Marian Beermann
28ad779a6f
Add tertiary authentication for metadata (TAM)
...
Signed-off-by: Thomas Waldmann <tw@waldmann-edv.de>
2016-12-17 20:06:41 +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
enkore
49c05719d8
Merge pull request #1941 from enkore/issue/1936
...
Fix some clock problems
2016-12-17 13:20:56 +01:00
Marian Beermann
445365b3ff
update changes
2016-12-17 12:00:25 +01:00
Thomas Waldmann
6b6ddecd93
document windows 10 linux subsystem install
...
also add note about remote repos being broken on cygwin.
2016-12-17 00:25:49 +01:00
Thomas Waldmann
82cd1fd392
run setup.py build_usage
2016-12-14 03:42:38 +01:00
Thomas Waldmann
c855c687eb
Merge branch '1.0-maint'
2016-12-14 03:33:53 +01:00
TW
60bbd7a944
update CHANGES (1.0-maint) ( #1954 )
2016-12-14 01:29:43 +01:00
Marian Beermann
9147c7038b
update 1.1 beta CHANGES
2016-12-11 15:18:52 +01:00
Thomas Waldmann
09b1079b18
update CHANGES (master / 1.1 beta)
2016-12-11 06:20:10 +01:00
Thomas Waldmann
bd8b4a4489
update CHANGES (1.0-maint)
2016-12-09 04:42:23 +01:00
Marian Beermann
288cac788c
setup.py: build_usage: don't generate includes for debug commands
2016-12-02 13:28:49 +01:00
Thomas Waldmann
a100fb67eb
Merge branch '1.0-maint' into merge-1.0-maint
...
# Conflicts:
# AUTHORS
# src/borg/archive.py
# src/borg/key.py
2016-11-30 05:38:04 +01:00
Thomas Waldmann
d6d3f275df
docs: add python3-devel as a dependency for cygwin-based installation
2016-11-30 02:50:20 +01:00
Marian Beermann
c3a2dc5f55
Rename BORG_NONCES_DIR to BORG_SECURITY_DIR
2016-11-29 17:43:06 +01:00
Thomas Waldmann
4746d20534
ran build_usage
...
had merge conflicts in the usage files, decided to just recreate them afterwards.
2016-11-28 02:25:56 +01:00
Thomas Waldmann
c83a124e65
Merge branch '1.0-maint' (into master)
2016-11-28 02:23:32 +01:00
TW
2780a83452
Merge pull request #1885 from jcrben/patch-1
...
Clarify extract is relative to current directory
2016-11-27 20:41:39 +01:00
Ben Creasy
a49fc6faf5
Clarify extract is relative to current directory
...
I'm still hoping that a destination switch can be added (requested long ago in https://github.com/jborg/attic/issues/195 ), but in the meantime this may help. I'm guessing this clobbers any existing files.
2016-11-27 11:35:36 -08:00
Marian Beermann
bf3a1f0c33
docs/usage: fix literal/emph without end-string (two instances)
2016-11-27 20:18:27 +01:00
