Updated Branches: refs/heads/cassandra-1.2 e329c3078 -> efded0046 refs/heads/cassandra-1.2.0 3957df175 -> edf63d8a5 refs/heads/trunk 1a0bc5991 -> 633dbbd7a
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/633dbbd7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/633dbbd7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/633dbbd7 Branch: refs/heads/trunk Commit: 633dbbd7a156e91460817ec8bdb460aa2cdcfb11 Parents: 1a0bc59 efded00 Author: Brandon Williams <[email protected]> Authored: Mon Nov 19 14:26:49 2012 -0600 Committer: Brandon Williams <[email protected]> Committed: Mon Nov 19 14:26:49 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/hadoop/BulkOutputFormat.java | 4 ++-- .../apache/cassandra/hadoop/BulkRecordWriter.java | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
