mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-23 22:51:35 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1387 from PlasmaPower/remove-trailing-whitespace

Browse source 
Remove trailing whitespace
This commit is contained in:
TW 2016-07-27 17:07:21 +02:00 committed by GitHub
commit 769f9d80ab
7 changed files with 55 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.rst
View file

@ -33,14 +33,14 @@ Main features
Compared to other deduplication approaches, this method does NOT depend on: Compared to other deduplication approaches, this method does NOT depend on:
* file/directory names staying the same: So you can move your stuff around * file/directory names staying the same: So you can move your stuff around
without killing the deduplication, even between machines sharing a repo. without killing the deduplication, even between machines sharing a repo.
* complete files or time stamps staying the same: If a big file changes a * complete files or time stamps staying the same: If a big file changes a
little, only a few new chunks need to be stored - this is great for VMs or little, only a few new chunks need to be stored - this is great for VMs or
raw disks. raw disks.
* The absolute position of a data chunk inside a file: Stuff may get shifted * The absolute position of a data chunk inside a file: Stuff may get shifted
and will still be found by the deduplication algorithm. and will still be found by the deduplication algorithm.
**Speed** **Speed**

6
docs/changes.rst
View file

@ -383,7 +383,7 @@ Compatibility notes:
- disambiguate -p option, #563: - disambiguate -p option, #563:
- -p now is same as --progress - -p now is same as --progress
- -P now is same as --prefix - -P now is same as --prefix
- remove deprecated "borg verify", - remove deprecated "borg verify",
use "borg extract --dry-run" instead use "borg extract --dry-run" instead
- cleanup environment variable semantics, #355 - cleanup environment variable semantics, #355
@ -448,7 +448,7 @@ New features:
- format options for location: user, pid, fqdn, hostname, now, utcnow, user - format options for location: user, pid, fqdn, hostname, now, utcnow, user
- borg list --list-format - borg list --list-format
- borg prune -v --list enables the keep/prune list output, #658 - borg prune -v --list enables the keep/prune list output, #658
Bug fixes: Bug fixes:
- fix _open_rb noatime handling, #657 - fix _open_rb noatime handling, #657
@ -466,7 +466,7 @@ Other changes:
- Vagrant: drop Ubuntu Precise (12.04) - does not have Python >= 3.4 - Vagrant: drop Ubuntu Precise (12.04) - does not have Python >= 3.4
- Vagrant: use pyinstaller v3.1.1 to build binaries - Vagrant: use pyinstaller v3.1.1 to build binaries
- docs: - docs:
- borg upgrade: add to docs that only LOCAL repos are supported - borg upgrade: add to docs that only LOCAL repos are supported
- borg upgrade also handles borg 0.xx -> 1.0 - borg upgrade also handles borg 0.xx -> 1.0
- use pip extras or requirements file to install llfuse - use pip extras or requirements file to install llfuse

2
docs/installation.rst
View file

@ -181,7 +181,7 @@ and commands to make fuse work for using the mount command.
echo 'vfs.usermount=1' >> /etc/sysctl.conf echo 'vfs.usermount=1' >> /etc/sysctl.conf
kldload fuse kldload fuse
sysctl vfs.usermount=1 sysctl vfs.usermount=1
Cygwin Cygwin
++++++ ++++++

2
docs/internals.rst
View file

@ -371,7 +371,7 @@ repository_id
enc_key enc_key
the key used to encrypt data with AES (256 bits) the key used to encrypt data with AES (256 bits)
enc_hmac_key enc_hmac_key
the key used to HMAC the encrypted data (256 bits) the key used to HMAC the encrypted data (256 bits)

26
docs/misc/internals-picture.txt
View file

@ -11,22 +11,22 @@ BorgBackup from 10.000m
| | | | | |
+------+-------+ | +------+-------+ |
| | | | | | | |
/chunk\/chunk\/chunk\... /maybe different chunks lists\ /chunk\/chunk\/chunk\... /maybe different chunks lists\
+-----------------------------------------------------------------+ +-----------------------------------------------------------------+
|item list | |item list |
+-----------------------------------------------------------------+ +-----------------------------------------------------------------+
| |
+-------------------------------------+--------------+ +-------------------------------------+--------------+
| | | | | |
| | | | | |
+-------------+ +-------------+ | +-------------+ +-------------+ |
|item0 | |item1 | | |item0 | |item1 | |
| - owner | | - owner | | | - owner | | - owner | |
| - size | | - size | ... | - size | | - size | ...
| - ... | | - ... | | - ... | | - ... |
| - chunks | | - chunks | | - chunks | | - chunks |
+----+--------+ +-----+-------+ +----+--------+ +-----+-------+
| | | |
| +-----+----------------------------+-----------------+ | +-----+----------------------------+-----------------+
| | | | | | | |
+-o-----o------------+ | +-o-----o------------+ |

64
docs/misc/prune-example.txt
View file

@ -14,41 +14,41 @@ Calendar view
------------- -------------
2015 2015
January February March January February March
Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su
1 2 3 4 1 1 1 2 3 4 1 1
5 6 7 8 9 10 11 2 3 4 5 6 7 8 2 3 4 5 6 7 8 5 6 7 8 9 10 11 2 3 4 5 6 7 8 2 3 4 5 6 7 8
12 13 14 15 16 17 18 9 10 11 12 13 14 15 9 10 11 12 13 14 15 12 13 14 15 16 17 18 9 10 11 12 13 14 15 9 10 11 12 13 14 15
19 20 21 22 23 24 25 16 17 18 19 20 21 22 16 17 18 19 20 21 22 19 20 21 22 23 24 25 16 17 18 19 20 21 22 16 17 18 19 20 21 22
26 27 28 29 30 31 23 24 25 26 27 28 23 24 25 26 27 28 29 26 27 28 29 30 31 23 24 25 26 27 28 23 24 25 26 27 28 29
30 31 30 31
April May June April May June
Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su
1 2 3 4 5 1 2 3 1 2 3 4 5 6 7 1 2 3 4 5 1 2 3 1 2 3 4 5 6 7
6 7 8 9 10 11 12 4 5 6 7 8 9 10 8 9 10 11 12 13 14 6 7 8 9 10 11 12 4 5 6 7 8 9 10 8 9 10 11 12 13 14
13 14 15 16 17 18 19 11 12 13 14 15 16 17 15 16 17 18 19 20 21 13 14 15 16 17 18 19 11 12 13 14 15 16 17 15 16 17 18 19 20 21
20 21 22 23 24 25 26 18 19 20 21 22 23 24 22 23 24 25 26 27 28 20 21 22 23 24 25 26 18 19 20 21 22 23 24 22 23 24 25 26 27 28
27 28 29 30 25 26 27 28 29 30 31 29 30m 27 28 29 30 25 26 27 28 29 30 31 29 30m
July August September
Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su
1 2 3 4 5 1 2 1 2 3 4 5 6
6 7 8 9 10 11 12 3 4 5 6 7 8 9 7 8 9 10 11 12 13
13 14 15 16 17 18 19 10 11 12 13 14 15 16 14 15 16 17 18 19 20
20 21 22 23 24 25 26 17 18 19 20 21 22 23 21 22 23 24 25 26 27
27 28 29 30 31m 24 25 26 27 28 29 30 28 29 30m
31m
October November December July August September
Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su
1 2 3 4 1 1 2 3 4 5 6 1 2 3 4 5 1 2 1 2 3 4 5 6
5 6 7 8 9 10 11 2 3 4 5 6 7 8 7 8 9 10 11 12 13 6 7 8 9 10 11 12 3 4 5 6 7 8 9 7 8 9 10 11 12 13
12 13 14 15 16 17 18 9 10 11 12 13 14 15 14 15 16 17d18d19d20 13 14 15 16 17 18 19 10 11 12 13 14 15 16 14 15 16 17 18 19 20
19 20 21 22 23 24 25 16 17 18 19 20 21 22 21d22d23d24d25d26d27d 20 21 22 23 24 25 26 17 18 19 20 21 22 23 21 22 23 24 25 26 27
26 27 28 29 30 31m 23 24 25 26 27 28 29 28d29d30d31d 27 28 29 30 31m 24 25 26 27 28 29 30 28 29 30m
30m 31m
October November December
Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su
1 2 3 4 1 1 2 3 4 5 6
5 6 7 8 9 10 11 2 3 4 5 6 7 8 7 8 9 10 11 12 13
12 13 14 15 16 17 18 9 10 11 12 13 14 15 14 15 16 17d18d19d20
19 20 21 22 23 24 25 16 17 18 19 20 21 22 21d22d23d24d25d26d27d
26 27 28 29 30 31m 23 24 25 26 27 28 29 28d29d30d31d
30m
List view List view
--------- ---------

2
tox.ini
View file

@ -18,4 +18,4 @@ passenv = *
[testenv:flake8] [testenv:flake8]
changedir = changedir =
deps = flake8 deps = flake8
commands = flake8 commands = flake8