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/487de3da Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/487de3da Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/487de3da Branch: refs/heads/cassandra-2.1 Commit: 487de3daf7340d3e3f8b6e68255e8d1de1466608 Parents: 94cfec8 8822c96 Author: Brandon Williams <[email protected]> Authored: Wed Aug 6 09:23:12 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Aug 6 09:23:12 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 5 +- .../hadoop/cql3/CqlPagingInputFormat.java | 85 -- .../hadoop/cql3/CqlPagingRecordReader.java | 800 ------------------- 4 files changed, 5 insertions(+), 886 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/487de3da/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/487de3da/NEWS.txt ----------------------------------------------------------------------
