Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82c0094a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82c0094a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82c0094a Branch: refs/heads/trunk Commit: 82c0094a89c30bf9b66e2d8c43003da98ea4c432 Parents: 2d6ab6f dc71d22 Author: Brandon Williams <[email protected]> Authored: Tue Nov 5 15:33:56 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Nov 5 15:33:56 2013 -0600 ---------------------------------------------------------------------- .../cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82c0094a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java ----------------------------------------------------------------------
