Merge branch 'cassandra-2.1.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/712f54fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/712f54fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/712f54fe Branch: refs/heads/cassandra-2.1 Commit: 712f54fe8f36756689b15771c7b4080366b3211b Parents: 3060ccc dbc4582 Author: Brandon Williams <[email protected]> Authored: Tue Aug 12 12:35:04 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Aug 12 12:35:04 2014 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/cql3/CqlRecordReader.java | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
