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 2013/09/07 20:59:11 UTC

[1/2] git commit: Rename in tracing: Index sample -> Partition summary

Updated Branches:
  refs/heads/cassandra-2.0 ad6f00afa -> 233ad183c


Rename in tracing: Index sample -> Partition summary


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

Branch: refs/heads/cassandra-2.0
Commit: b5f4d03d0675c75bff225505362ad0ca2eb9a3c0
Parents: 3d9c3dd
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Sep 7 21:58:14 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Sep 7 21:58:14 2013 +0300

----------------------------------------------------------------------
 src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5f4d03d/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index 06b1739..6327273 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -843,7 +843,7 @@ public class SSTableReader extends SSTable
             }
             else
             {
-                Tracing.trace("Index sample allows skipping sstable {}", descriptor.generation);
+                Tracing.trace("Partition summary allows skipping sstable {}", descriptor.generation);
                 return null;
             }
         }


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

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


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

Branch: refs/heads/cassandra-2.0
Commit: 233ad183caa9c4168ce45e6fd8100b6c002272b1
Parents: ad6f00a b5f4d03
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Sep 7 21:58:57 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Sep 7 21:58:57 2013 +0300

----------------------------------------------------------------------
 src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/233ad183/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------