Updated Branches:
refs/heads/cassandra-1.1 f5619bbfd -> 7db46ef80
refs/heads/trunk 9d2b26dac -> 18b49021b
Merge branch 'cassandra-1.1' into trunk
Conflicts:
src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/18b49021
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18b49021
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18b49021
Branch: refs/heads/trunk
Commit: 18b49021b4dcbe7d5e5122d4a954804c11b4a17f
Parents: 9d2b26d 7db46ef
Author: Brandon Williams <[email protected]>
Authored: Mon Aug 20 15:32:35 2012 -0500
Committer: Brandon Williams <[email protected]>
Committed: Mon Aug 20 15:32:35 2012 -0500
----------------------------------------------------------------------
.../cassandra/hadoop/ColumnFamilyInputFormat.java | 2 +-
.../cassandra/hadoop/ColumnFamilyOutputFormat.java | 14 +++-
.../cassandra/hadoop/ColumnFamilyRecordReader.java | 6 +-
.../org/apache/cassandra/hadoop/ConfigHelper.java | 55 ++++++++++++---
.../apache/cassandra/thrift/ITransportFactory.java | 36 ++++++++++
.../cassandra/thrift/TFramedTransportFactory.java | 37 ++++++++++
6 files changed, 133 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/18b49021/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/18b49021/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java
index f663df6,e01ada5..a1b2171
--- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java
@@@ -24,6 -27,10 +24,9 @@@ import java.util.HashMap
import java.util.List;
import java.util.Map;
-import org.apache.thrift.transport.TTransport;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.auth.IAuthenticator;
import org.apache.cassandra.thrift.*;
import org.apache.hadoop.conf.Configuration;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/18b49021/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
----------------------------------------------------------------------
