merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/670954cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/670954cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/670954cb Branch: refs/heads/trunk Commit: 670954cb3e6a1021c03884ffc4756caab0fba576 Parents: 8bf6e15 f1004e9 Author: Jonathan Ellis <[email protected]> Authored: Mon Jun 17 17:42:26 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jun 17 17:42:26 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../hadoop_cql3_word_count/src/WordCount.java | 9 +- .../AbstractColumnFamilyRecordWriter.java | 4 +- .../hadoop/ColumnFamilyRecordWriter.java | 2 +- .../cassandra/hadoop/cql3/CqlRecordWriter.java | 119 ++++++++++--------- 5 files changed, 67 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/670954cb/CHANGES.txt ----------------------------------------------------------------------
