You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/08/09 18:40:27 UTC
[1/7] git commit: merge from 1.1
Updated Branches:
refs/heads/cassandra-1.1 115f380a8 -> 9fb63a2f9
refs/heads/trunk ce368f812 -> 8a290c1b7
merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a290c1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a290c1b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a290c1b
Branch: refs/heads/trunk
Commit: 8a290c1b7cf3e414272f22ee5b0f3cae265f732b
Parents: ce368f8 9fb63a2
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 9 11:40:08 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 9 11:40:08 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 -
.../apache/cassandra/db/compaction/Scrubber.java | 2 +-
.../apache/cassandra/tools/StandaloneScrubber.java | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a290c1b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4001b0a,aa40626..3de82e2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -40,7 -2,7 +40,6 @@@
* fix offline scrub to catch >= out of order rows (CASSANDRA-4411)
--1.1.3
* munmap commitlog segments before rename (CASSANDRA-4337)
* (JMX) rename getRangeKeySample to sampleKeyRange to avoid returning
multi-MB results as an attribute (CASSANDRA-4452)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a290c1b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a290c1b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
----------------------------------------------------------------------