Updated Branches: refs/heads/trunk 332e5a511 -> e12d4430e
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e12d4430 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e12d4430 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e12d4430 Branch: refs/heads/trunk Commit: e12d4430edeeabf00b3c76eead36d4b4af8f3ff6 Parents: 332e5a5 35aad40 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Feb 2 18:02:53 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Feb 2 18:02:53 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/hadoop/BulkRecordWriter.java | 84 +++++++++++---- 1 files changed, 65 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
