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/5909b5f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5909b5f8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5909b5f8 Branch: refs/heads/trunk Commit: 5909b5f87ec5fe3cea55402ccd618eb491d1c4f2 Parents: 470e3fe d38ca32 Author: Brandon Williams <[email protected]> Authored: Tue Nov 5 13:41:58 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Nov 5 13:41:58 2013 -0600 ---------------------------------------------------------------------- .../cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5909b5f8/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java ----------------------------------------------------------------------
