Updated Branches: refs/heads/cassandra-1.1 112014a4c -> 822bda77a
replace mistaken usage of commons-logging with slf4j patch by dbrosius reviewed by jbellis for CASSANDRA-5464 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/822bda77 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/822bda77 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/822bda77 Branch: refs/heads/cassandra-1.1 Commit: 822bda77aba24fda8b234590bedb292e32443aa5 Parents: 112014a Author: Dave Brosius <dbros...@apache.org> Authored: Sat Apr 13 01:03:11 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Sat Apr 13 01:03:11 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/hadoop/pig/CassandraStorage.java | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/822bda77/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 59a7443..b225cdf 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/822bda77/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java index f362fca..55ccbb9 100644 --- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java @@ -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;
