Merge branch 'cassandra-2.0' into cassandra-2.1

This commit is contained in:
Aleksey Yeschenko 2015-03-03 15:14:59 -08:00
commit 2acd05d967
1 changed files with 2 additions and 2 deletions

View File

@ -27,7 +27,7 @@
# Command to execute to archive a commitlog segment
# Parameters: %path => Fully qualified path of the segment to archive
# %name => Name of the commit log.
# Example: archive_command=/bin/ln %path /backup/%name
# Example: archive_command=/bin/cp -f %path /backup/%name
#
# Limitation: *_command= expects one command with arguments. STDOUT
# and STDIN or multiple commands cannot be executed. You might want
@ -37,7 +37,7 @@ archive_command=
# Command to execute to make an archived commitlog live again.
# Parameters: %from is the full path to an archived commitlog segment (from restore_directories)
# %to is the live commitlog directory
# Example: restore_command=cp -f %from %to
# Example: restore_command=/bin/cp -f %from %to
restore_command=
# Directory to scan the recovery files in.