Updated Branches: refs/heads/trunk 2170f1e80 -> 887c7f9c2
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/887c7f9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/887c7f9c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/887c7f9c Branch: refs/heads/trunk Commit: 887c7f9c25c8ac4830b12454af95e78745670195 Parents: 2170f1e d2c22a8 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Feb 14 07:31:24 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Feb 14 07:31:24 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/Config.java | 11 +++ .../cassandra/config/DatabaseDescriptor.java | 68 +++++++-------- .../apache/cassandra/hadoop/BulkRecordWriter.java | 10 +- .../io/sstable/AbstractSSTableSimpleWriter.java | 10 ++- .../apache/cassandra/io/sstable/SSTableLoader.java | 8 ++ .../io/sstable/SSTableSimpleUnsortedWriter.java | 5 +- .../cassandra/io/sstable/SSTableSimpleWriter.java | 9 ++- .../apache/cassandra/service/StorageService.java | 31 +++---- .../io/sstable/SSTableSimpleWriterTest.java | 5 +- 9 files changed, 92 insertions(+), 65 deletions(-) ----------------------------------------------------------------------
