Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52a650ea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52a650ea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52a650ea Branch: refs/heads/trunk Commit: 52a650ea7439fff2757aa051a175a1ffb43e16d8 Parents: 6e61c4c 2f3b5bf Author: Brandon Williams <[email protected]> Authored: Wed Dec 5 14:28:41 2012 -0600 Committer: Brandon Williams <[email protected]> Committed: Wed Dec 5 14:28:41 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/concurrent/StageManager.java | 9 +++++---- src/java/org/apache/cassandra/config/Config.java | 3 ++- .../cassandra/config/DatabaseDescriptor.java | 2 +- .../PeriodicCommitLogExecutorService.java | 3 ++- .../db/compaction/ParallelCompactionIterable.java | 2 +- .../cassandra/hadoop/ColumnFamilyRecordWriter.java | 3 ++- .../io/compress/CompressionParameters.java | 1 + .../apache/cassandra/io/sstable/SSTableReader.java | 2 +- .../org/apache/cassandra/service/StorageProxy.java | 2 +- .../apache/cassandra/thrift/CustomTHsHaServer.java | 3 ++- .../org/apache/cassandra/utils/FBUtilities.java | 8 ++++++++ 11 files changed, 26 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
