You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/06/14 23:21:43 UTC

[5/9] git commit: Merge branch 'cassandra-1.1' into trunk

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

Branch: refs/heads/trunk
Commit: 8516bcb2e364cab24b5711d695db0889795a465a
Parents: b3915f5 1280c6c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jun 14 16:05:49 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jun 14 16:05:49 2012 -0500

----------------------------------------------------------------------
 .../db/compaction/LeveledCompactionTask.java       |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8516bcb2/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java
----------------------------------------------------------------------