You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/01/15 09:43:17 UTC
[3/4] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0c27bce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0c27bce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0c27bce
Branch: refs/heads/cassandra-3.3
Commit: e0c27bcecbddde536878f897ee19deae9da0a2a0
Parents: 58643b0 ee1c145
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Jan 15 09:31:18 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Jan 15 09:31:18 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/compaction/CompactionManager.java | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0c27bce/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0c27bce/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------