svn commit: r929778 - /cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyChecker.java

[jbellis]

Author: jbellis
Date: Thu Apr  1 01:55:05 2010
New Revision: 929778

URL: http://svn.apache.org/viewvc?rev=929778&view=rev
Log:
fix merge

Modified:
    
cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyChecker.java

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyChecker.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyChecker.java?rev=929778&r1=929777&r2=929778&view=diff
==============================================================================
--- 
cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyChecker.java 
(original)
+++ 
cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyChecker.java 
Thu Apr  1 01:55:05 2010
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
 
 class ConsistencyChecker implements Runnable
 {
-    private static Logger logger_ = 
LoggerFactory.getLogger(ConsistencyManager.class);
+    private static Logger logger_ = 
LoggerFactory.getLogger(ConsistencyChecker.class);
     private static ExpiringMap<String, String> readRepairTable_ = new 
ExpiringMap<String, String>(DatabaseDescriptor.getRpcTimeout());
 
     private final String table_;