Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68fa88d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68fa88d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68fa88d1 Branch: refs/heads/trunk Commit: 68fa88d1e231fdd31c0e6d0bc772430252d20218 Parents: 98eec0a ac19be9 Author: Dave Brosius <[email protected]> Authored: Fri Jun 7 23:50:41 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri Jun 7 23:50:41 2013 -0400 ---------------------------------------------------------------------- .../hadoop/cql3/CqlPagingRecordReader.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
