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/d151b402 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d151b402 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d151b402 Branch: refs/heads/trunk Commit: d151b402d498db93287e4b006f13f11c18e70fc8 Parents: 079de5b 4a295b6 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed May 28 11:33:58 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed May 28 11:33:58 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
