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