Updated Branches: refs/heads/trunk 887c7f9c2 -> 418d27a1e
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/418d27a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/418d27a1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/418d27a1 Branch: refs/heads/trunk Commit: 418d27a1e2c0f6312e5be24a6d4263b97848789f Parents: 887c7f9 648e62e Author: Chris Goffinet <c...@chrisgoffinet.com> Authored: Tue Feb 14 09:13:18 2012 -0800 Committer: Chris Goffinet <c...@chrisgoffinet.com> Committed: Tue Feb 14 09:13:18 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../apache/cassandra/hadoop/BulkRecordWriter.java | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) ----------------------------------------------------------------------