Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc608010 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc608010 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc608010 Branch: refs/heads/trunk Commit: dc6080107272393f64e4960897d40486c8ab3650 Parents: 235bae7 bb1deac Author: Brandon Williams <[email protected]> Authored: Wed May 28 13:22:45 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed May 28 13:22:45 2014 -0500 ---------------------------------------------------------------------- .../hadoop/ColumnFamilyInputFormat.java | 7 +- .../hadoop/ColumnFamilyRecordReader.java | 70 ++++++++++---------- .../hadoop/pig/AbstractCassandraStorage.java | 2 +- 3 files changed, 39 insertions(+), 40 deletions(-) ----------------------------------------------------------------------
