Updated Branches: refs/heads/cassandra-1.1 d685f45ee -> 29376ff67 refs/heads/trunk 830495027 -> abf0d991d
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/abf0d991 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/abf0d991 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/abf0d991 Branch: refs/heads/trunk Commit: abf0d991d86a3f34f429e2fd376fe93eaf54edfc Parents: 8304950 29376ff Author: Brandon Williams <[email protected]> Authored: Fri Mar 23 15:00:39 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Mar 23 15:00:39 2012 -0500 ---------------------------------------------------------------------- .../cassandra/db/compaction/CompactionManager.java | 27 +++++++++++++++ .../db/compaction/CompactionManagerMBean.java | 10 +++++ 2 files changed, 37 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/abf0d991/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/abf0d991/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java ----------------------------------------------------------------------
