1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 09:47:58 +00:00
Commit graph

716 commits

Author SHA1 Message Date
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
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
Marian Beermann
a2505517ee FAQ: fix link to changelog 2016-11-27 20:15:05 +01:00
Thomas Waldmann
5de31f57e5 ran build_usage 2016-11-27 02:33:57 +01:00
Thomas Waldmann
91fa568d5e add note about issue #1837 2016-11-27 02:22:33 +01:00
Thomas Waldmann
bd0e14040e move "important notes" to own section 2016-11-27 02:22:28 +01:00
Thomas Waldmann
cc15806766 update CHANGES (1.0-maint) 2016-11-27 02:21:14 +01:00
Thomas Waldmann
30d1e21e53 fixup: fixes, clarify 2016-11-26 20:49:39 +01:00
Thomas Waldmann
76c5f1a258 add more details about resource usage 2016-11-26 04:34:01 +01:00
Thomas Waldmann
0a0b913739 implement BORG_NEW_PASSPHRASE, fixes #1768 2016-11-24 23:43:27 +01:00
Thomas Waldmann
c8b58e0fd8 improve cache / index docs, esp. files cache docs, fixes #1825 2016-11-24 01:53:23 +01:00
Thomas Waldmann
5fe5b6b339 docs: different pattern matching for --exclude, fixes #1779 2016-11-19 22:26:07 +01:00
Thomas Waldmann
d8e806aac1 docs: datetime formatting examples for {now} placeholder, fixes #1822 2016-11-19 22:04:13 +01:00
Thomas Waldmann
3d174aef35 docs: clarify passphrase mode attic repo upgrade, fixes #1854 2016-11-19 21:52:11 +01:00
Thomas Waldmann
d7284a92f0 docs: clarify --umask usage, fixes #1859 2016-11-19 21:38:13 +01:00
Thomas Waldmann
afab1cc9b0 Merge branch '1.0-maint'
# Conflicts:
#	borg/platform.py
#	src/borg/archiver.py
#	src/borg/helpers.py
#	src/borg/platform/darwin.pyx
#	src/borg/platform/freebsd.pyx
#	src/borg/platform/linux.pyx
#	src/borg/testsuite/__init__.py
2016-11-17 23:56:34 +01:00
Thomas Waldmann
e17fe2b295 borg umount, fixes #1855
this refactors umount code we already used for the testsuite into the platform module's namespace.

also, it exposes that functionality via the cli api, so users can use it via "borg umount <mountpoint>",
which is more consistent than using borg to mount and fusermount -u (or umount) to un-mount.
2016-11-17 20:16:28 +01:00
Abdel-Rahman
9cf4846c27 Typo 2016-11-15 00:11:32 +02:00
Thomas Waldmann
c81f861ba6 developers docs: clarify how to choose PR target branch 2016-11-14 03:26:39 +01:00
Marian Beermann
c2eb2539b9
Document maintenance merge command 2016-11-13 16:07:06 +01:00
enkore
223f7890fe Merge pull request #1819 from enkore/issue/1800
Add BLAKE2b key types
2016-11-11 03:11:38 +01:00
Marian Beermann
a31ca4f022
crypto: link against system libb2, if possible 2016-11-11 03:08:11 +01:00
Marian Beermann
05a52ec8ec
Merge branch '1.0-maint' into merge/1.0-maint 2016-11-09 23:56:54 +01:00
TW
94ff4959ee Merge pull request #1808 from anarcat/restore-size
restore normal size
2016-11-05 02:37:43 +01:00