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/06/07 00:01:17 UTC
[5/9] 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/c1dfc8fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1dfc8fc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1dfc8fc
Branch: refs/heads/trunk
Commit: c1dfc8fc53f65da5c9d9c7b4a3234200a3616d78
Parents: 6a360a0 02a7ba8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jun 6 17:00:28 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jun 6 17:00:28 2013 -0500
----------------------------------------------------------------------
examples/hadoop_cql3_word_count/src/WordCount.java | 18 +-
.../src/WordCountCounters.java | 11 +-
.../cassandra/hadoop/cql3/CQLConfigHelper.java | 2 +-
.../hadoop/cql3/ColumnFamilyInputFormat.java | 83 --
.../hadoop/cql3/ColumnFamilyOutputFormat.java | 78 --
.../hadoop/cql3/ColumnFamilyRecordReader.java | 763 ---------------
.../hadoop/cql3/ColumnFamilyRecordWriter.java | 383 --------
.../cassandra/hadoop/cql3/CqlOutputFormat.java | 78 ++
.../hadoop/cql3/CqlPagingInputFormat.java | 83 ++
.../hadoop/cql3/CqlPagingRecordReader.java | 763 +++++++++++++++
.../cassandra/hadoop/cql3/CqlRecordWriter.java | 383 ++++++++
11 files changed, 1320 insertions(+), 1325 deletions(-)
----------------------------------------------------------------------