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/406c3387 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/406c3387 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/406c3387 Branch: refs/heads/trunk Commit: 406c3387d9cf3cc27a225dfd8ac23c00078cc24a Parents: d3e7787 cf60ca8 Author: Brandon Williams <[email protected]> Authored: Tue May 20 19:02:50 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue May 20 19:02:50 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
