You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/06/06 06:03:09 UTC
[1/2] git commit: fix logging context
Repository: cassandra
Updated Branches:
refs/heads/trunk 43292388e -> 6125b0b86
fix logging context
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd9e4638
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd9e4638
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd9e4638
Branch: refs/heads/trunk
Commit: cd9e4638fa878d4d6ef286918d33a25835436bbc
Parents: 9b536ec
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Jun 6 00:01:58 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Jun 6 00:01:58 2014 -0400
----------------------------------------------------------------------
.../cassandra/streaming/compress/CompressedStreamReader.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd9e4638/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
index 3c13d11..d843351 100644
--- a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
+++ b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java
@@ -32,7 +32,6 @@ import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.io.compress.CompressionMetadata;
import org.apache.cassandra.io.sstable.SSTableWriter;
-import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.streaming.ProgressInfo;
import org.apache.cassandra.streaming.StreamReader;
import org.apache.cassandra.streaming.StreamSession;
@@ -45,7 +44,7 @@ import org.apache.cassandra.utils.Pair;
*/
public class CompressedStreamReader extends StreamReader
{
- private static final Logger logger = LoggerFactory.getLogger(StreamReader.class);
+ private static final Logger logger = LoggerFactory.getLogger(CompressedStreamReader.class);
protected final CompressionInfo compressionInfo;
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@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/6125b0b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6125b0b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6125b0b8
Branch: refs/heads/trunk
Commit: 6125b0b8695d99bcfad3bf631a8d023d033bf2ea
Parents: 4329238 cd9e463
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Jun 6 00:02:32 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Jun 6 00:02:32 2014 -0400
----------------------------------------------------------------------
.../cassandra/streaming/compress/CompressedStreamReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------