diff --git a/documentation/sphinx/source/backups.rst b/documentation/sphinx/source/backups.rst index 1679924290..bef728d200 100644 --- a/documentation/sphinx/source/backups.rst +++ b/documentation/sphinx/source/backups.rst @@ -256,7 +256,7 @@ The ``modify`` subcommand is used to modify parameters of a running backup. All Sets new duration for the backup's currently active snapshot, in seconds, relative to the start of the snapshot. ``--verify_uid `` - Specifies a UID to verify against the BackupUID of the running backup. If provided, the UID is verified in the same transaction which sets the new backup parameters. + Specifies a UID to verify against the BackupUID of the running backup. If provided, the UID is verified in the same transaction which sets the new backup parameters (if the UID matches). .. program:: fdbbackup abort diff --git a/documentation/sphinx/source/release-notes.rst b/documentation/sphinx/source/release-notes.rst index 51345e3151..cd71f2ee11 100644 --- a/documentation/sphinx/source/release-notes.rst +++ b/documentation/sphinx/source/release-notes.rst @@ -12,6 +12,13 @@ Fixes * The ``include`` command in fdbcli would falsly include all machines with IP addresses that have the included IP address as a prefix (for example ``include 1.0.0.1`` would also include ``1.0.0.10``). `(PR #1121) `_ +* Restore could crash when reading a file that ends on a block boundary (1MB default). `(PR #1205) `_ + +Features +-------- + +* Added ``modify`` command to fdbbackup for modifying parameters of a running backup. `(PR #1237) `_ +* Added 'header' parameter to blobstore backup URLs for setting custom HTTP headers. `(PR #1237) `_ 6.0.18 ====== diff --git a/fdbbackup/backup.actor.cpp b/fdbbackup/backup.actor.cpp index b838a3cf08..f7b26bf981 100644 --- a/fdbbackup/backup.actor.cpp +++ b/fdbbackup/backup.actor.cpp @@ -831,7 +831,8 @@ static void printBackupUsage(bool devhelp) { printf(" -as, --active_snapshot_interval DURATION\n" " For modify operations, sets the desired interval for the backup's currently active snapshot, relative to the start of the snapshot.\n"); printf(" --verify_uid UID\n" - " Specifies a UID to verify against the BackupUID of the running backup. If provided, the UID is verified in the same transaction which sets the new backup parameters.\n"); + " Specifies a UID to verify against the BackupUID of the running backup. If provided, the UID is verified in the same transaction\n" + " which sets the new backup parameters (if the UID matches).\n"); printf(" -e ERRORLIMIT The maximum number of errors printed by status (default is 10).\n"); printf(" -k KEYS List of key ranges to backup.\n" " If not specified, the entire database will be backed up.\n");