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