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

3273 Commits

Author SHA1 Message Date
TW f568244a98 Merge pull request #1836 from enkore/f/smfsc 
repository: check_free_space, special case small repos
 2016-11-12 22:55:21 +01:00
Marian Beermann 00fae3f3e3
repository: check_free_space, special case small repos 2016-11-12 14:42:13 +01:00
enkore 80b86709ef Merge pull request #1833 from enkore/issue/1821 
borg init: fix free space check crashing if disk is full
 2016-11-12 01:23:34 +01:00
enkore e26348a055 Merge pull request #1834 from enkore/issue/1813 
Clarify cache/repository README file
 2016-11-11 21:25:30 +01:00
Marian Beermann bd4a0fe23b
Clarify cache/repository README file 2016-11-11 21:24:17 +01:00
enkore 01e56a8650 Merge pull request #1835 from enkore/f/sch-master 
debug, key: enable --help
 2016-11-11 19:55:48 +01:00
Marian Beermann ac5f9b61ec
debug, key: enable --help 
A small merge mishap in 2a864be8; 1.0-maint has it correctly.
 2016-11-11 19:54:11 +01:00
Marian Beermann 6c955579a8 repository: test_additional_free_space, assert it still exists 2016-11-11 16:39:11 +01:00
Marian Beermann 5b31a2cd61
borg init: fix free space check crashing if disk is full 2016-11-11 16:21:05 +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 05ce8e0ff9 Add test script for blake2b_256 against CPython 3.6 hashlib 2016-11-11 03:07:05 +01:00
Marian Beermann 76c93bb80b crypto blake2: don't release the GIL during key hashing 2016-11-11 03:07:05 +01:00
Marian Beermann 00ac7b14be Add BLAKE2b key types 2016-11-11 03:07:05 +01:00
TW 19f6f7f146 Merge pull request #1830 from languitar/1.0-maint 
Clarify prune behavior for different archive contents
 2016-11-10 21:17:13 +01:00
Johannes Wienke 3ee019761a Clarify prune behavior for different archive contents 
In the online help, explain that archives with different contents need to be
separated via the prefix when pruning to achieve a desired retention policy per
archive set.

Relates to #1824.
 2016-11-10 19:40:15 +01:00
enkore 5fecac63a9 testsuite/archiver: fix missing newline before RemoteArchiverTestCase 2016-11-10 17:35:59 +01:00
TW dc4325be25 Merge pull request #1826 from textshell/feature/repository-cleanup-rollback-api 
Repository: rollback's cleanup parameter is internal.
 2016-11-10 17:24:01 +01:00
enkore b026c8d0ec Merge pull request #1827 from textshell/feature/gitattribute-diff-python 
.gitattributes: Set python diff mode for all *.py files.
 2016-11-10 16:59:59 +01:00
Martin Hostettler 74ab7f1f61 .gitattributes: Set python diff mode for all *.py files. 2016-11-10 16:48:35 +01:00
Martin Hostettler 79c77e7a68 Repository: rollback's cleanup parameter is internal. 2016-11-10 13:44:58 +01:00
TW 0cf4a16c5f Merge pull request #1818 from enkore/merge/1.0-maint 
merge 1.0-maint
 2016-11-10 02:24:24 +01:00
Marian Beermann 09f470bd85 Add crypto.blake2b_256 2016-11-10 00:06:50 +01:00
Marian Beermann 05a52ec8ec
Merge branch '1.0-maint' into merge/1.0-maint 2016-11-09 23:56:54 +01:00
enkore cf44954c34 Merge pull request #1674 from enkore/f/stale-lock-murderer 
Automatically remove stale locks
 2016-11-07 21:58:34 +01:00
Marian Beermann 676e69cac4 Parse & pass BORG_HOSTNAME_IS_UNIQUE env var to enable stale lock killing 2016-11-07 21:56:40 +01:00
Marian Beermann cc14975f2d Add tests for stale lock killing and platform.process_alive 2016-11-07 21:56:07 +01:00
Marian Beermann 2bd8ac7762 platform: bump API version (and check consistency) 2016-11-07 21:54:16 +01:00
Marian Beermann 7930d055ec import platform module instead of functions 
(testability)
 2016-11-07 21:54:16 +01:00
Marian Beermann 8e1df7a364 Use logging instead of prints 2016-11-07 21:54:16 +01:00
Marian Beermann c562f7750c Move platform-dependent code to platform package 2016-11-07 21:54:16 +01:00
Oleg Drokin d490292be3 Detect and delete stale locks when it's safe 
If BORG_UNIQUE_HOSTNAME shell variable is set, stale locks
in both cache and repository are deleted.

Stale lock is defined as a lock that's originating from the same
hostname as us, and correspond to a pid that no longer exists.

This fixes #562
 2016-11-07 21:54:16 +01:00
TW cc499fe7f9 Merge pull request #1791 from ThomasWaldmann/vagrant-llfuse-build 
vagrant: remove llfuse from tox.ini at a central place
 2016-11-05 14:25:10 +01:00
TW 19891d655b Merge pull request #1792 from ThomasWaldmann/cygwin-no-remote-archiver-tests 
skip remote tests on cygwin
 2016-11-05 14:24:34 +01:00
TW 94ff4959ee Merge pull request #1808 from anarcat/restore-size 
restore normal size
 2016-11-05 02:37:43 +01:00
Antoine Beaupré adfd66d636 restore normal size 
otherwise code examples overflow
 2016-11-04 21:27:21 -04:00
TW 365ec85aa1 Merge pull request #1807 from anarcat/docs-misc 
fix more issues with the PDF
 2016-11-05 02:22:39 +01:00
Antoine Beaupré 057ad07d4b fix a heading that was incorrectly set 2016-11-04 21:16:41 -04:00
Antoine Beaupré ec0ef2eaca remove third level headings, too verbose 2016-11-04 21:15:31 -04:00
Antoine Beaupré af23eea39d fix levels in authors section 
that way in the TOC, it doesn't look like borg authors are attic
 2016-11-04 21:14:59 -04:00
TW 45c76c1dba Merge pull request #1804 from anarcat/security-notes 
move security verification to support section
 2016-11-05 02:04:27 +01:00
Antoine Beaupré 319ecd81bb fix links in standalone README 
github and standalone docutils don't parse :ref: tags correctly
 2016-11-04 20:58:28 -04:00
Antoine Beaupré 0cda9d6bd3 add link to security contact in README 2016-11-04 20:58:27 -04:00
Antoine Beaupré 19ae2a7870 add FAQ about security 2016-11-04 20:58:27 -04:00
Antoine Beaupré b4d0388785 move security verification to support section 
the rationale is to simplify the README file to the bare
minimum. security researchers will be able to find the contact
information if they look minimally and people installing the software
will find a link where relevant (in binary releases only, since all
the others have other trust paths)
 2016-11-04 20:58:27 -04:00
TW c5f5d17bf0 Merge pull request #1805 from anarcat/pdf-docs 
improvements to the PDF version of the documentation
 2016-11-05 01:36:03 +01:00
Antoine Beaupré aeb10d1a85 show URLs in PDF, better font 2016-11-04 16:01:18 -04:00
Antoine Beaupré 5def2350d0 fix PDF rendering structure 
without those changes, all of the toctree document headings do not
show up. they are considered to be "below" the last heading of the
README file.

we also remove the "Notes" section from the readme as there is only
one note, regarding the fork.

we introduce a stub "introduction" element in the toctree, otherwise
it is impossible for the PDF rendered to render the README correctly.

this is to workaround a bug in the PDF renderer.
 2016-11-04 16:01:18 -04:00
Antoine Beaupré 18f3d64e4c PDF docs: add logo and fix authors 
the PDF documentation looks much better with those
 2016-11-04 15:59:55 -04:00
TW d31a3c78eb Merge pull request #1803 from anarcat/readme-refresh 
move fork differences to FAQ
 2016-11-04 20:38:03 +01:00