You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/07/25 20:11:33 UTC
[01/10] git commit: update CL archive comments post-6905
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 60e56d4be -> f5e634c1c
refs/heads/cassandra-2.1 192f693b5 -> b2a37c798
refs/heads/cassandra-2.1.0 5001b382e -> 5544ecbf6
refs/heads/trunk 45983497f -> 01d51d5a3
update CL archive comments post-6905
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5e634c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5e634c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5e634c1
Branch: refs/heads/cassandra-2.0
Commit: f5e634c1cc6af270f6005cdd1672d32dd99e24a7
Parents: 60e56d4
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 13:10:54 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 13:10:54 2014 -0500
----------------------------------------------------------------------
conf/commitlog_archiving.properties | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5e634c1/conf/commitlog_archiving.properties
----------------------------------------------------------------------
diff --git a/conf/commitlog_archiving.properties b/conf/commitlog_archiving.properties
index 0687cd6..be4692e 100644
--- a/conf/commitlog_archiving.properties
+++ b/conf/commitlog_archiving.properties
@@ -46,12 +46,10 @@ restore_directories=
# Restore mutations created up to and including this timestamp in GMT.
# Format: yyyy:MM:dd HH:mm:ss (2012:04:31 20:43:12)
#
-# Note! Recovery will stop when the first client-supplied timestamp
-# greater than this time is encountered. Since the order Cassandra
-# receives mutations does not always strictly follow timestamp order,
-# this may leave some mutations with timestamps earlier than the
-# point-in-time unrecovered.
+# Recovery will continue through the segment when the first client-supplied
+# timestamp greater than this time is encountered, but only mutations less than
+# or equal to this timestamp will be applied.
restore_point_in_time=
# precision of the timestamp used in the inserts (MILLISECONDS, MICROSECONDS, ...)
-precision=MICROSECONDS
\ No newline at end of file
+precision=MICROSECONDS
[02/10] git commit: update CL archive comments post-6905
Posted by br...@apache.org.
update CL archive comments post-6905
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5e634c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5e634c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5e634c1
Branch: refs/heads/cassandra-2.1.0
Commit: f5e634c1cc6af270f6005cdd1672d32dd99e24a7
Parents: 60e56d4
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 13:10:54 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 13:10:54 2014 -0500
----------------------------------------------------------------------
conf/commitlog_archiving.properties | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5e634c1/conf/commitlog_archiving.properties
----------------------------------------------------------------------
diff --git a/conf/commitlog_archiving.properties b/conf/commitlog_archiving.properties
index 0687cd6..be4692e 100644
--- a/conf/commitlog_archiving.properties
+++ b/conf/commitlog_archiving.properties
@@ -46,12 +46,10 @@ restore_directories=
# Restore mutations created up to and including this timestamp in GMT.
# Format: yyyy:MM:dd HH:mm:ss (2012:04:31 20:43:12)
#
-# Note! Recovery will stop when the first client-supplied timestamp
-# greater than this time is encountered. Since the order Cassandra
-# receives mutations does not always strictly follow timestamp order,
-# this may leave some mutations with timestamps earlier than the
-# point-in-time unrecovered.
+# Recovery will continue through the segment when the first client-supplied
+# timestamp greater than this time is encountered, but only mutations less than
+# or equal to this timestamp will be applied.
restore_point_in_time=
# precision of the timestamp used in the inserts (MILLISECONDS, MICROSECONDS, ...)
-precision=MICROSECONDS
\ No newline at end of file
+precision=MICROSECONDS
[09/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.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/b2a37c79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2a37c79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2a37c79
Branch: refs/heads/cassandra-2.1
Commit: b2a37c798920e646629a0c3c772b1cedd6e08ee5
Parents: 192f693 5544ecb
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 13:11:18 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 13:11:18 2014 -0500
----------------------------------------------------------------------
conf/commitlog_archiving.properties | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[06/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5544ecbf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5544ecbf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5544ecbf
Branch: refs/heads/cassandra-2.1.0
Commit: 5544ecbf643f3d6b4d8a1ad9758e86867c065e1c
Parents: 5001b38 f5e634c
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 13:11:08 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 13:11:08 2014 -0500
----------------------------------------------------------------------
conf/commitlog_archiving.properties | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[03/10] git commit: update CL archive comments post-6905
Posted by br...@apache.org.
update CL archive comments post-6905
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5e634c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5e634c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5e634c1
Branch: refs/heads/cassandra-2.1
Commit: f5e634c1cc6af270f6005cdd1672d32dd99e24a7
Parents: 60e56d4
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 13:10:54 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 13:10:54 2014 -0500
----------------------------------------------------------------------
conf/commitlog_archiving.properties | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5e634c1/conf/commitlog_archiving.properties
----------------------------------------------------------------------
diff --git a/conf/commitlog_archiving.properties b/conf/commitlog_archiving.properties
index 0687cd6..be4692e 100644
--- a/conf/commitlog_archiving.properties
+++ b/conf/commitlog_archiving.properties
@@ -46,12 +46,10 @@ restore_directories=
# Restore mutations created up to and including this timestamp in GMT.
# Format: yyyy:MM:dd HH:mm:ss (2012:04:31 20:43:12)
#
-# Note! Recovery will stop when the first client-supplied timestamp
-# greater than this time is encountered. Since the order Cassandra
-# receives mutations does not always strictly follow timestamp order,
-# this may leave some mutations with timestamps earlier than the
-# point-in-time unrecovered.
+# Recovery will continue through the segment when the first client-supplied
+# timestamp greater than this time is encountered, but only mutations less than
+# or equal to this timestamp will be applied.
restore_point_in_time=
# precision of the timestamp used in the inserts (MILLISECONDS, MICROSECONDS, ...)
-precision=MICROSECONDS
\ No newline at end of file
+precision=MICROSECONDS
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.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/b2a37c79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2a37c79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2a37c79
Branch: refs/heads/trunk
Commit: b2a37c798920e646629a0c3c772b1cedd6e08ee5
Parents: 192f693 5544ecb
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 13:11:18 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 13:11:18 2014 -0500
----------------------------------------------------------------------
conf/commitlog_archiving.properties | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[07/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5544ecbf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5544ecbf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5544ecbf
Branch: refs/heads/trunk
Commit: 5544ecbf643f3d6b4d8a1ad9758e86867c065e1c
Parents: 5001b38 f5e634c
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 13:11:08 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 13:11:08 2014 -0500
----------------------------------------------------------------------
conf/commitlog_archiving.properties | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5544ecbf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5544ecbf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5544ecbf
Branch: refs/heads/cassandra-2.1
Commit: 5544ecbf643f3d6b4d8a1ad9758e86867c065e1c
Parents: 5001b38 f5e634c
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 13:11:08 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 13:11:08 2014 -0500
----------------------------------------------------------------------
conf/commitlog_archiving.properties | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[04/10] git commit: update CL archive comments post-6905
Posted by br...@apache.org.
update CL archive comments post-6905
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5e634c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5e634c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5e634c1
Branch: refs/heads/trunk
Commit: f5e634c1cc6af270f6005cdd1672d32dd99e24a7
Parents: 60e56d4
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 13:10:54 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 13:10:54 2014 -0500
----------------------------------------------------------------------
conf/commitlog_archiving.properties | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5e634c1/conf/commitlog_archiving.properties
----------------------------------------------------------------------
diff --git a/conf/commitlog_archiving.properties b/conf/commitlog_archiving.properties
index 0687cd6..be4692e 100644
--- a/conf/commitlog_archiving.properties
+++ b/conf/commitlog_archiving.properties
@@ -46,12 +46,10 @@ restore_directories=
# Restore mutations created up to and including this timestamp in GMT.
# Format: yyyy:MM:dd HH:mm:ss (2012:04:31 20:43:12)
#
-# Note! Recovery will stop when the first client-supplied timestamp
-# greater than this time is encountered. Since the order Cassandra
-# receives mutations does not always strictly follow timestamp order,
-# this may leave some mutations with timestamps earlier than the
-# point-in-time unrecovered.
+# Recovery will continue through the segment when the first client-supplied
+# timestamp greater than this time is encountered, but only mutations less than
+# or equal to this timestamp will be applied.
restore_point_in_time=
# precision of the timestamp used in the inserts (MILLISECONDS, MICROSECONDS, ...)
-precision=MICROSECONDS
\ No newline at end of file
+precision=MICROSECONDS
[10/10] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@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/01d51d5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01d51d5a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01d51d5a
Branch: refs/heads/trunk
Commit: 01d51d5a3b50d62dcc647b45ce68c08a61c6d57b
Parents: 4598349 b2a37c7
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 25 13:11:28 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 25 13:11:28 2014 -0500
----------------------------------------------------------------------
conf/commitlog_archiving.properties | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------