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/16 21:27:42 UTC

[3/5] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1

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/087644b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/087644b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/087644b6

Branch: refs/heads/trunk
Commit: 087644b6c0a580aa394658d798c34afa69dd3298
Parents: 555b738 97d4c1c
Author: Brandon Williams <br...@apache.org>
Authored: Fri Mar 16 15:26:34 2012 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Mar 16 15:26:34 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/087644b6/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------