cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [7/50] git commit: Merge branch 'cassandra-1.1' into trunk
Date Tue, 14 Feb 2012 18:52:13 GMT
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/cassandra-1.0
Commit: 887c7f9c25c8ac4830b12454af95e78745670195
Parents: 2170f1e d2c22a8
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Feb 14 07:31:24 2012 -0600
Committer: Brandon Williams <brandonwilliams@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(-)
----------------------------------------------------------------------



Mime
View raw message