You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/01 01:16:44 UTC
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
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/2451140b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2451140b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2451140b
Branch: refs/heads/trunk
Commit: 2451140b868faed033c291ba0589a05564aae04b
Parents: e01c238 7a39421
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Jul 31 18:16:31 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jul 31 18:16:31 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../hadoop/cql3/CqlPagingRecordReader.java | 41 ++++++++++++++++++--
.../cassandra/hadoop/cql3/CqlRecordWriter.java | 33 ++++++++++++++++
3 files changed, 72 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2451140b/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2451140b/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2451140b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
----------------------------------------------------------------------