Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dbc45825 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbc45825 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dbc45825 Branch: refs/heads/trunk Commit: dbc458256f9b6c1bce4b84476e1e7d4a2cec77e5 Parents: fbe7b90 7049ee0 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Aug 12 12:34:46 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Aug 12 12:34:46 2014 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/cql3/CqlRecordReader.java | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dbc45825/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java ----------------------------------------------------------------------
