mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,712 Commits 9 Branches 138 Tags 59 MiB
Commit Graph

2712 Commits

Author SHA1 Message Date
enkore c055dd2636 Merge pull request #1848 from ThomasWaldmann/clarify-pr-targets 
developers docs: clarify how to choose PR target branch
 2016-11-14 08:11:14 +01:00
Thomas Waldmann c81f861ba6 developers docs: clarify how to choose PR target branch 2016-11-14 03:26:39 +01:00
TW cda88e1207 Merge pull request #1847 from ThomasWaldmann/travis-osx 
travis: allow OS X failures until the brew cask osxfuse issue is fixed
 2016-11-14 03:19:34 +01:00
Thomas Waldmann 372ebb4e55 travis: allow OS X failures until the brew cask osxfuse issue is fixed 2016-11-14 02:08:11 +01:00
enkore 4b5a17c096 Merge pull request #1841 from enkore/issue/1837 
Fix check incorrectly reporting attic 0.13 and earlier archives as corrupt
 2016-11-13 15:26:19 +01:00
Marian Beermann a898297669
check: improve "did not get expected metadata dict" diagnostic 2016-11-13 15:25:40 +01:00
Marian Beermann 639eba1635 Fix check incorrectly reporting attic 0.13 and earlier archives as corrupt 2016-11-13 15:25:10 +01:00
TW 9b1241eecd Merge pull request #1844 from enkore/issue/1815 
check: catch two kinds of different repos
 2016-11-13 14:44:17 +01:00
Marian Beermann 2261709e78
check: handle repo w/o objects gracefully 
normal check would complete, --repair would crash when trying
to write the rebuilt (empty) manifest out, since self.key was None
 2016-11-13 11:45:42 +01:00
Marian Beermann 64a3fa8e73 check: bail out early if repository is *completely* empty 2016-11-13 11:40:19 +01:00
enkore 3789c78f60 Merge pull request #1843 from enkore/issue/1801 
Fix tox/pybuild in 1.0-maint
 2016-11-13 11:32:08 +01:00
Marian Beermann 960c42193a
fix tox build for environment-python != containing-python in yet-another instance 
this instance: the repository worktree is *not* named borg.

Cherry pick of 4f1157c into 1.0-maint due to f3efcdb

TODO removed since we already did that after 1.0-maint, but 1.0-maint
will never receive the change.
 2016-11-13 11:20:00 +01:00
enkore 1a0218b50f Merge pull request #1840 from ThomasWaldmann/fix-logger 
at xattr module import time, loggers are not initialized yet
 2016-11-13 02:05:06 +01:00
Thomas Waldmann 3237db4621 at xattr module import time, loggers are not initialized yet 2016-11-12 23:10:40 +01:00
TW 5c98b850dc Merge pull request #1839 from ThomasWaldmann/osxfuse-non-beta 
osxfuse non-beta
 2016-11-12 23:04:50 +01:00
Thomas Waldmann cd8dfda318 caskroom osxfuse-beta gone, it's osxfuse now (3.5.3) 2016-11-12 23:02:13 +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
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
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
Antoine Beaupré 7f9a147e46 move fork differences to FAQ 
it seems now that the fork is more of historical value than a current
thing. people interested in the differences between borg and attic can
look in the FAQ, but I do not see why this is present in the README.

a new section regarding compatibility is created to keep that warning
in place.
 2016-11-04 12:34:41 -04:00
Thomas Waldmann df7191e55c skip remote tests on cygwin 
remote is broken and hangs infinitely on cygwin.

https://github.com/borgbackup/borg/issues/1268
 2016-11-02 04:09:16 +01:00
Thomas Waldmann 1b462cdbed vagrant: remove llfuse from tox.ini at a central place 2016-11-02 03:12:57 +01:00
TW e38e4160ef Merge pull request #1780 from ThomasWaldmann/fix-centos6-testing 
vagrant: do not try to install llfuse on centos6
 2016-11-02 01:31:58 +01:00
TW 935d66085f Merge pull request #1784 from ThomasWaldmann/fix-darwin64-fuse-tests 
vagrant: fix fuse test for darwin, fixes #1546
 2016-11-02 01:31:42 +01:00
TW 34d742028e Merge pull request #1787 from ololoru/windows10-maint-1.0 
add windows virtual machine
 2016-11-02 01:31:14 +01:00
ololoru 5b0bff1962 add windows virtual machine 
* Default memory size of Windows VM is 2048 mb
* Stop using mls-openssh and replace it with cygwin sshd by updating service start path in registry
 2016-10-31 11:37:57 -05:00
Thomas Waldmann f2ed60b80b vagrant: fix fuse test for darwin, fixes #1546 
otherwise the "input" dir is root.wheel -rwx------ and gives a PermissionError when trying to access it.
 2016-10-31 05:02:19 +01:00
Thomas Waldmann aa62a164d9 vagrant: do not try to install llfuse on centos6 
it breaks everything...
 2016-10-31 02:36:49 +01:00
Thomas Waldmann 84637322f2 ran build_usage 2016-10-29 01:58:21 +02:00
TW 89c31d6b44 Merge pull request #1763 from ThomasWaldmann/update-1.0-changes 
update CHANGES (1.0-maint)
 2016-10-29 01:44:39 +02:00