Updated Branches: refs/heads/cassandra-1.1 0e2706a7f -> c3690da4e
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3690da4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3690da4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3690da4 Branch: refs/heads/cassandra-1.1 Commit: c3690da4ef71d3d266a7f69bcc404c06c065d91b Parents: 0e2706a cd806dd Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Mar 19 13:45:38 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Mar 19 13:45:38 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/hadoop/BulkOutputFormat.java | 2 +- .../apache/cassandra/hadoop/BulkRecordWriter.java | 33 ++++++++-- .../cassandra/hadoop/ColumnFamilyOutputFormat.java | 2 +- .../cassandra/hadoop/ColumnFamilyRecordWriter.java | 9 +++ .../org/apache/cassandra/hadoop/Progressable.java | 50 +++++++++++++++ 5 files changed, 88 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
