mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-23 06:31:58 +00:00
Code Issues Releases Wiki Activity
3406 commits 9 branches 139 tags 63 MiB
Commit graph

3406 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
TW
9eb336a453 Merge pull request #1799 from anarcat/faster-quickstart 
faster quickstart
 2016-11-03 21:56:23 +01:00
Antoine Beaupré
c8c0495724 faster quickstart 
move the note about free space after the step by step example. it is
unlikely that users will hit out of space conditions on their first
run, and at the end of the example, they will see the not anyways.

this is to make the documentation less scary for new users and easier
to use.
 2016-11-03 14:17:55 -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
TW
9dd57d3571 Merge pull request #1785 from ThomasWaldmann/merge-1.0-maint 
Merge 1.0-maint
 2016-11-02 01:29:20 +01:00
Thomas Waldmann
8a15916284 Merge branch '1.0-maint' into merge-1.0-maint 
# Conflicts:
#	docs/changes.rst
#	docs/usage/help.rst.inc
#	src/borg/cache.py
#	src/borg/remote.py
#	src/borg/testsuite/__init__.py
#	src/borg/testsuite/archiver.py
 2016-10-31 18:24:13 +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
Thomas Waldmann
20f4a1f478 update CHANGES (1.0-maint) 2016-10-29 01:18:55 +02:00
TW
9c071771fc Merge pull request #1769 from ThomasWaldmann/ssh-url-docs 
repo url / archive location docs + typo fix
 2016-10-29 00:46:13 +02:00