natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace mistaken usage of commons-logging with slf4j 

patch by dbrosius reviewed by jbellis for CASSANDRA-5464
This commit is contained in:
Dave Brosius 2013-04-13 01:03:11 -04:00
parent 112014a4c8
commit 822bda77ab
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -14,6 +14,7 @@
* Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372)
* Fix cf name extraction from manifest in Directories.migrateFile() (CASSANDRA-5242)
* Support pluggable internode authentication (CASSANDRA-5401)
* Replace mistaken usage of commons-logging with slf4j (CASSANDRA-5464)
1.1.10

7
src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
View File

@ -21,9 +21,6 @@ import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.util.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.cassandra.auth.IAuthenticator;
import org.apache.cassandra.config.ConfigurationException;
import org.apache.cassandra.db.Column;
@ -49,6 +46,8 @@ import org.apache.pig.ResourceSchema.ResourceFieldSchema;
import org.apache.thrift.TDeserializer;
import org.apache.thrift.TException;
import org.apache.thrift.TSerializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* A LoadStoreFunc for retrieving data from and storing data to Cassandra
@ -82,7 +81,7 @@ public class CassandraStorage extends LoadFunc implements StoreFuncInterface, Lo
private final static String PARTITION_FILTER_SIGNATURE = "cassandra.partition.filter";
private final static ByteBuffer BOUND = ByteBufferUtil.EMPTY_BYTE_BUFFER;
private static final Log logger = LogFactory.getLog(CassandraStorage.class);
private static final Logger logger = LoggerFactory.getLogger(CassandraStorage.class);
private ByteBuffer slice_start = BOUND;
private ByteBuffer slice_end = BOUND;