1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-25 01:06:50 +00:00

Merge branch '1.0-maint'

This commit is contained in:
Thomas Waldmann 2016-05-05 13:55:38 +02:00
commit 39c0757020
3 changed files with 24 additions and 4 deletions

View file

@ -1283,6 +1283,9 @@ def build_parser(self, args=None, prog=None):
'.checkpoint.N' (with N being a number), because these names are used for '.checkpoint.N' (with N being a number), because these names are used for
checkpoints and treated in special ways. checkpoints and treated in special ways.
In the archive name, you may use the following format tags:
{now}, {utcnow}, {fqdn}, {hostname}, {user}, {pid}
To speed up pulling backups over sshfs and similar network file systems which do To speed up pulling backups over sshfs and similar network file systems which do
not provide correct inode information the --ignore-inode flag can be used. This not provide correct inode information the --ignore-inode flag can be used. This
potentially decreases reliability of change detection, while avoiding always reading potentially decreases reliability of change detection, while avoiding always reading

View file

@ -70,6 +70,24 @@ Other changes:
- ChunkBuffer: add test for leaving partial chunk in buffer, fixes #945 - ChunkBuffer: add test for leaving partial chunk in buffer, fixes #945
Version 1.0.3 (not released yet)
--------------------------------
Bug fixes:
- prune: ignore checkpoints, #997
- prune: fix bad validator, #942
- fix capabilities extraction on Linux (set xattrs last, after chown())
Other changes:
- update readthedocs URLs, #991
- add missing docs for "borg break-lock", #992
- borg create help: add some words to about the archive name
- borg create help: document format tags, #894
- Vagrantfile: OS X: update osxfuse / install lzma package, #933
Version 1.0.2 Version 1.0.2
------------- -------------

View file

@ -311,10 +311,9 @@ Examples
# Even slower, even higher compression (N = 0..9) # Even slower, even higher compression (N = 0..9)
$ borg create --compression lzma,N /path/to/repo::arch ~ $ borg create --compression lzma,N /path/to/repo::arch ~
# Format tags available for archive name: # Use short hostname, user name and current time in archive name
# {now}, {utcnow}, {fqdn}, {hostname}, {user}, {pid} $ borg create /path/to/repo::{hostname}-{user}-{now} ~
# add short hostname, backup username and current unixtime (seconds from epoch) $ borg create /path/to/repo::{hostname}-{user}-{now:%Y-%m-%d_%H:%M:%S} ~
$ borg create /path/to/repo::{hostname}-{user}-{now:%s} ~
.. include:: usage/extract.rst.inc .. include:: usage/extract.rst.inc