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

Posted to commits@cassandra.apache.org by yu...@apache.org on 2013/09/13 18:41:21 UTC

[6/7] git commit: Merge branch 'cassandra-2.0' into trunk

Merge branch 'cassandra-2.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76acc804
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76acc804
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76acc804

Branch: refs/heads/trunk
Commit: 76acc80408b9a7b3ac87aee738e02e5cbb558896
Parents: 71c94fe ab31b21
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Sep 13 11:39:22 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Sep 13 11:39:22 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                      | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/76acc804/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/76acc804/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------