You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/03/04 00:15:35 UTC

[1/3] cassandra git commit: Update example commands in commitlog_archiving.properties

Repository: cassandra
Updated Branches:
  refs/heads/trunk 787a20fdd -> 56348ea7b


Update example commands in commitlog_archiving.properties

patch by Sam Tunnicliffe; reviewed by Michael Shuler for CASSANDRA-8290


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a936d7e7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a936d7e7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a936d7e7

Branch: refs/heads/trunk
Commit: a936d7e7fbbc432748d634c326b680d5063742d0
Parents: e7d802e
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Mar 3 15:10:36 2015 -0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 3 15:12:32 2015 -0800

----------------------------------------------------------------------
 conf/commitlog_archiving.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a936d7e7/conf/commitlog_archiving.properties
----------------------------------------------------------------------
diff --git a/conf/commitlog_archiving.properties b/conf/commitlog_archiving.properties
index be4692e..109a50b 100644
--- a/conf/commitlog_archiving.properties
+++ b/conf/commitlog_archiving.properties
@@ -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.


[2/3] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2acd05d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2acd05d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2acd05d9

Branch: refs/heads/trunk
Commit: 2acd05d96778fc4d4f8ee8cef322f3624638bd8c
Parents: 2d1e46e a936d7e
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Mar 3 15:14:59 2015 -0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 3 15:14:59 2015 -0800

----------------------------------------------------------------------
 conf/commitlog_archiving.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56348ea7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56348ea7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56348ea7

Branch: refs/heads/trunk
Commit: 56348ea7b7011d3d203d9dfaa0f5f32752771a86
Parents: 787a20f 2acd05d
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Mar 3 15:15:29 2015 -0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 3 15:15:29 2015 -0800

----------------------------------------------------------------------
 conf/commitlog_archiving.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------