Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29376ff6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29376ff6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29376ff6 Branch: refs/heads/cassandra-1.1 Commit: 29376ff67b7dd7f60489f7bb365d6e90a7570e62 Parents: d685f45 f11e4f2 Author: Brandon Williams <[email protected]> Authored: Fri Mar 23 15:00:11 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Mar 23 15:00:11 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/29376ff6/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
