You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by vi...@apache.org on 2012/02/14 19:52:13 UTC

[5/50] git commit: Merge branch 'cassandra-1.1' into trunk

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/cassandra-1.0
Commit: 418d27a1e2c0f6312e5be24a6d4263b97848789f
Parents: 887c7f9 648e62e
Author: Chris Goffinet <cg...@chrisgoffinet.com>
Authored: Tue Feb 14 09:13:18 2012 -0800
Committer: Chris Goffinet <cg...@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(-)
----------------------------------------------------------------------