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/e533b9fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e533b9fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e533b9fd Branch: refs/heads/cassandra-1.0 Commit: e533b9fd83e75c6340b5f46376f2a57b4c4ca725 Parents: 418d27a 5dac208 Author: Chris Goffinet <c...@chrisgoffinet.com> Authored: Tue Feb 14 09:59:20 2012 -0800 Committer: Chris Goffinet <c...@chrisgoffinet.com> Committed: Tue Feb 14 09:59:20 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/hadoop/BulkRecordWriter.java | 3 +- .../org/apache/cassandra/hadoop/ConfigHelper.java | 40 +++++++++++++++ .../io/sstable/SSTableSimpleUnsortedWriter.java | 17 ++++++- 4 files changed, 58 insertions(+), 3 deletions(-) ----------------------------------------------------------------------