Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c531f537 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c531f537 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c531f537 Branch: refs/heads/cassandra-2.1 Commit: c531f537fe68610430218904876e30c9ceba21ee Parents: 44f4e79 8b8042b Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Apr 22 09:43:01 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Apr 22 09:43:01 2014 -0500 ---------------------------------------------------------------------- .../apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 2 +- .../apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c531f537/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java ----------------------------------------------------------------------
