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/c807b42d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c807b42d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c807b42d Branch: refs/heads/trunk Commit: c807b42d70535e5e25b91d8454f363fd5a6a0245 Parents: 11c8a22 7b398c5 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri May 9 19:51:55 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri May 9 19:51:55 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/hadoop/cql3/CqlPagingRecordReader.java | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c807b42d/CHANGES.txt ----------------------------------------------------------------------
