You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/03/09 00:47:14 UTC
[1/2] git commit: Merge branch 'cassandra-1.1.0' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1.0
Updated Branches:
refs/heads/cassandra-1.1.0 d78db44cb -> 9a3acc872
Merge branch 'cassandra-1.1.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a3acc87
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a3acc87
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a3acc87
Branch: refs/heads/cassandra-1.1.0
Commit: 9a3acc872e18fd108d7bf890775d4ab2a9bd5f5a
Parents: 79a0541 d78db44
Author: Brandon Williams <br...@apache.org>
Authored: Thu Mar 8 17:45:45 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Mar 8 17:45:45 2012 -0600
----------------------------------------------------------------------
CHANGES.txt | 10 +++
build.xml | 1 +
lib/metrics-core-2.0.3.jar | Bin 0 -> 80800 bytes
src/java/org/apache/cassandra/db/ColumnFamily.java | 20 +++++
.../org/apache/cassandra/db/ColumnFamilyStore.java | 16 +++--
src/java/org/apache/cassandra/db/DataTracker.java | 15 ++--
.../apache/cassandra/db/SliceFromReadCommand.java | 2 +-
.../cassandra/db/compaction/CompactionManager.java | 8 +-
.../cassandra/db/compaction/CompactionTask.java | 16 +++-
.../db/compaction/LeveledCompactionStrategy.java | 13 +++-
.../cassandra/db/compaction/LeveledManifest.java | 59 +++++++++-----
.../cassandra/db/compaction/OperationType.java | 1 +
.../org/apache/cassandra/io/util/FileUtils.java | 17 ----
.../cassandra/metrics/ClientRequestMetrics.java | 32 ++++++++
.../SSTableListChangedNotification.java | 11 ++-
.../org/apache/cassandra/service/StorageProxy.java | 20 +++++
.../apache/cassandra/service/StorageService.java | 8 ++
.../org/apache/cassandra/cli/CliHelp.yaml | 29 ++++++-
.../cassandra/db/compaction/CompactionsTest.java | 3 +-
19 files changed, 213 insertions(+), 68 deletions(-)
----------------------------------------------------------------------