Updated Branches: refs/heads/cassandra-1.1 555b73808 -> 087644b6c refs/heads/trunk e36e68460 -> 5ed172053
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/5ed17205 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ed17205 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ed17205 Branch: refs/heads/trunk Commit: 5ed172053b1d71dbd342f5979dec6f7432497d61 Parents: e36e684 087644b Author: Brandon Williams <[email protected]> Authored: Fri Mar 16 15:27:28 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Mar 16 15:27:28 2012 -0500 ---------------------------------------------------------------------- .../cassandra/db/compaction/CompactionManager.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ed17205/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
