1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 02:08:54 +00:00
Commit graph

2595 commits

Author SHA1 Message Date
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
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
Thomas Waldmann
a16c7d8e16 mention file:// 2016-10-28 05:04:23 +02:00
Thomas Waldmann
11e9780393 quickstart: add a comment about other (remote) filesystems 2016-10-28 04:57:15 +02:00
Thomas Waldmann
e0298b2932 simplify quickstart
only give one possible ssh url syntax, all others are documented in usage chapter.
2016-10-28 04:51:46 +02:00
Thomas Waldmann
ca15cc80e5 document repo URLs / archive location 2016-10-28 04:43:33 +02:00
Thomas Waldmann
9b9179312d ssh: repo url docs - fix typo 2016-10-28 03:32:37 +02:00
TW
de9aa1923f Merge pull request #1762 from julian-klode/for-1.0/fix-bug-940
RemoteRepository: Fix busy wait in call_many, fixes #940
2016-10-26 21:19:31 +02:00
enkore
25ef14e853 Merge pull request #1756 from ThomasWaldmann/fix-freebsd-fuse-tests
Fix freebsd fuse tests
2016-10-25 20:56:17 +02:00
TW
d4072bfad0 Merge pull request #1742 from ThomasWaldmann/migrate-previous-location
avoid previous_location mismatch, fixes #1741
2016-10-25 19:25:17 +02:00
Andrew Skalski
2df8b740dd RemoteRepository: Fix busy wait in call_many, fixes #940
(cherry picked from commit 731f6241fa)
2016-10-25 11:24:12 +02:00
Thomas Waldmann
baa77c0e04 avoid previous_location mismatch, fixes #1741
due to the changed canonicalization for relative pathes in PR #1711 (implement /./ relpath hack),
there would be a changed repo location warning and the user would be asked if this is ok.
this would break automation and require manual intervention, which is unwanted.

thus, we automatically fix the previous_location config entry, if it only changed in the
expected way, but still means the same location.
2016-10-24 19:29:35 +02:00
Thomas Waldmann
02ecf04780 fuse tests: catch ENOTSUP on freebsd
seems like fuse does not support xattrs there at all.
2016-10-24 05:19:50 +02:00
Thomas Waldmann
ede3b4a354 fuse: test troublesome xattrs last 2016-10-24 05:19:50 +02:00
Thomas Waldmann
48fa449e39 assert_dirs_equal: add ignore_bsdflags and ignore_xattrs argument
bsdflags are not supported in the FUSE mount.
xattrs are supported, but are tested separately.
2016-10-24 05:19:50 +02:00
TW
77110913c7 Merge pull request #1758 from flokli/patch-2
docs/deployment.rst: do not use bare variables in ansible snippet
2016-10-24 02:39:16 +02:00
Florian Klink
88f7f8673d docs/deployment.rst: do not use bare variables in ansible snippet
The current snippet throws deprecation warnings:

```
[DEPRECATION WARNING]: Using bare variables is deprecated. Update your 
playbooks so that the environment value uses the full variable syntax 
('{{auth_users}}').
This feature will be removed in a future 
release. Deprecation warnings can be disabled by setting 
deprecation_warnings=False in ansible.cfg.
```
2016-10-24 02:34:28 +02:00