Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d38ca325
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d38ca325
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d38ca325
Branch: refs/heads/trunk
Commit: d38ca325218b75436d674c4ecaba564d2abc36eb
Parents: 91a81b7 cd7b05f
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Tue Nov 5 13:41:45 2013 -0600
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Tue Nov 5 13:41:45 2013 -0600
----------------------------------------------------------------------
.../cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d38ca325/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
----------------------------------------------------------------------
diff --cc
src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
index 060469d,8fd66ab..274e43f
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@@ -60,7 -55,12 +60,8 @@@ import org.apache.thrift.TException
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TTransport;
+ import org.apache.thrift.transport.TTransportException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
public abstract class AbstractColumnFamilyInputFormat<K, Y> extends
InputFormat<K, Y> implements org.apache.hadoop.mapred.InputFormat<K, Y>
{
