1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-29 11:16:43 +00:00
Commit graph

2256 commits

Author SHA1 Message Date
TW
18263f6257 Merge pull request #1019 from ThomasWaldmann/pkgsrc-osx-prefix
seek /opt/pkg (pkgsrc OS X) for openssl and lz4
2016-05-06 17:04:51 +02:00
Thomas Waldmann
0fa663febe seek /opt/pkg (pkgsrc OS X) for openssl and lz4
Add /opt/pkg (used by pkgsrc on Mac OS X) to possible openssl and
lz4 header path.

    from 2015Q2 onwards the prefix has changed to /opt/pkg
    in order to be compatible with El Capitan's
    "System Integrity Protection" feature.

-- pkgsrc.joynet.com

thanks to @weakish for finding this!
2016-05-06 14:56:54 +02:00
TW
d22bbe17c5 Merge pull request #1015 from ThomasWaldmann/checkpoint-docs
faq: be more detailed about how checkpoints work, fixes #994
2016-05-05 19:13:18 +02:00
Thomas Waldmann
4c52fcffcc faq: be more detailed about how checkpoints work, fixes #994 2016-05-05 18:59:03 +02:00
TW
571329e6ae Merge pull request #1013 from ThomasWaldmann/docs-fix-issue-links
faq: fix issue links
2016-05-05 18:31:04 +02:00
TW
6e12d9c92d Merge pull request #1012 from ThomasWaldmann/append-only-docs
FAQ: add entries about compromised machines and other troubles, fixes #1011
2016-05-05 18:30:20 +02:00
Thomas Waldmann
619654b802 faq: fix issue links 2016-05-05 18:16:32 +02:00
Thomas Waldmann
8304b8a591 FAQ: add entries about compromised machines and other troubles
also: fix append-only mode description - "multiple machines" and "central server" are over-specific and not required for this scenario.
2016-05-05 17:52:31 +02:00
TW
37de94e532 Merge pull request #1008 from ThomasWaldmann/cleanup-checkpoints
prune: kill all checkpoints except the latest, fixes #998
2016-05-05 15:38:23 +02:00
Thomas Waldmann
dabf816364 prune: cleanup checkpoints
kill all the checkpoints when pruning, except the latest one which might be
useful for continuing an interrupted backup. kill the latest checkpoint also
if it is already superceded by a successful backup.

note: this only works on checkpoints matched by --prefix, other checkpoints
      are not touched.
2016-05-05 15:15:14 +02:00
Thomas Waldmann
39c0757020 Merge branch '1.0-maint' 2016-05-05 13:55:38 +02:00
TW
f9638645d1 Merge pull request #996 from ThomasWaldmann/update-1.0-docs
update CHANGES in 1.0-maint
2016-05-05 13:51:59 +02:00
TW
6ae1999ff3 Merge pull request #1010 from ThomasWaldmann/doc-tags
borg create help: document format tags, fixes #894
2016-05-05 13:49:21 +02:00
Thomas Waldmann
7457c0f5da update CHANGES in 1.0-maint 2016-05-05 13:43:40 +02:00
Thomas Waldmann
9e09786b33 borg create help: document format tags, fixes #894
docs: rephrased, more useful examples
2016-05-05 13:38:08 +02:00
Thomas Waldmann
f070e2313d Merge branch '1.0-maint' 2016-05-03 22:07:12 +02:00
TW
61b4a56025 Merge pull request #1007 from ThomasWaldmann/compression-predictor
compression heuristics based on lz4, fixes #1006
2016-05-03 20:34:56 +02:00
Thomas Waldmann
f44b4bb9b7 travis / OSX: add xz package for python lzma support 2016-05-03 19:57:44 +02:00
Thomas Waldmann
75b3e786ed implement compression heuristics based on lz4-compressibility, fixes #1006
also: add some tests that invoke all supported compression algorithms
2016-05-03 19:57:44 +02:00
TW
5ec627bc9b Merge pull request #990 from ThomasWaldmann/with-lock
borg with-lock REPO CMD ARGS
2016-05-03 00:21:05 +02:00
Thomas Waldmann
962c2e9d54 borg with-lock REPO CMD ARGS 2016-05-02 23:29:17 +02:00
TW
21f753816d Merge pull request #1000 from ThomasWaldmann/prune-ignore-checkpoints
borg prune: ignore checkpoints, fixes #997
2016-05-02 01:26:06 +02:00
TW
12fb137667 Merge pull request #1001 from ThomasWaldmann/env-borg-key-file
add BORG_KEY_FILE
2016-05-02 01:22:10 +02:00
Thomas Waldmann
b743fd09ab borg prune: ignore checkpoints, fixes #997
also:
- add a test for this
- add some words to borg create help about the archive name
2016-05-02 01:12:15 +02:00
Thomas Waldmann
e7ca74fbef move BORG_KEY_FILE closer to BORG_KEYS_DIR 2016-05-02 00:38:16 +02:00
Thomas Waldmann
0bdc757bbf add tests for BORG_KEY_FILE env var 2016-05-01 22:10:29 +02:00
Félix Sipma
a5ba0abe42 support new env var 'BORG_KEY_FILE' 2016-05-01 21:15:09 +02:00
Thomas Waldmann
b641d11e1b Merge branch '1.0-maint' 2016-05-01 20:28:17 +02:00
Thomas Waldmann
240e5696b7 fix vagrant ssh syntax, fixes #999 2016-05-01 20:18:17 +02:00
Thomas Waldmann
700e715b23 add missing docs for borg break-lock, fixes #992 2016-04-30 00:32:25 +02:00
TW
7718d73133 Merge pull request #995 from ThomasWaldmann/update-site-urls
update readthedocs urls, fixes #991
2016-04-30 00:15:01 +02:00
Thomas Waldmann
4b73ebc613 update readthedocs urls, fixes #991 2016-04-29 03:19:27 +02:00
enkore
369af5feb3 Merge pull request #970 from enkore/feature/selftest
Add power-on self-test
2016-04-28 01:07:28 +02:00
Marian Beermann
fcd323f22a
Bump API version of crypto.pyx (overlooked in c5bd7f2) 2016-04-28 00:06:40 +02:00
Marian Beermann
8d3b1a5804 Add self tests
These run in ~100 ms here, so even on much slower machines (where also
Python setup will be slower) it shouldn't be noticeable at all.
2016-04-28 00:06:19 +02:00
TW
2bb9bc46ad Merge pull request #810 from ThomasWaldmann/flexible-compression
Flexible compression - pattern matching on path/filename
2016-04-27 23:41:54 +02:00
Thomas Waldmann
f20a78cda8 flexible compression 2016-04-27 03:08:55 +02:00
TW
425cb952bb Merge pull request #984 from anarcat/patch-3
fix debian sid cross-reference in install docs
2016-04-26 17:39:36 +02:00
anarcat
0a30d40a9d fix debian sid cross-reference in install docs 2016-04-25 22:54:36 -04:00
TW
ddc7687d9e Merge pull request #977 from ThomasWaldmann/info-show-duration
make borg info more similar to borg create --stats, add duration
2016-04-25 19:47:32 +02:00
TW
f6d363ecf9 Merge pull request #956 from icefoxen/master
Added Salt example to documentation
2016-04-25 15:30:14 +02:00
Thomas Waldmann
2ccc02d2f1 make borg info more similar to borg create --stats, add duration 2016-04-25 15:07:10 +02:00
enkore
96226b5f81 Merge pull request #976 from ThomasWaldmann/issue-974
fixes Issue 974
2016-04-25 14:23:28 +02:00
TW
81a1952c9a Merge pull request #978 from ThomasWaldmann/fix-osx
vagrant: OS X update osxfuse / fix lzma, fixes #933
2016-04-24 02:35:34 +02:00
Thomas Waldmann
5a7c027296 vagrant: OS X update osxfuse / fix lzma, fixes #933 2016-04-24 02:25:04 +02:00
Thomas Waldmann
d883791df7 use safe_encode/decode 2016-04-23 22:57:04 +02:00
Thomas Waldmann
d3fe134abd add a bin_to_hex helper and some properties 2016-04-23 22:42:56 +02:00
enkore
65f442dc8d Merge pull request #965 from enkore/fix/mount-perf
borg mount: cache partially read data chunks
2016-04-23 18:07:01 +02:00
Marian Beermann
bfb00dfa01
borg mount: cache partially read data chunks
Fixes #966
2016-04-23 18:05:22 +02:00
TW
a220a2d617 Merge pull request #969 from rumpelsepp/patch-2
docs/installation: Add FreeBSD Ports tree
2016-04-23 13:55:37 +02:00