Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39680ee8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39680ee8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39680ee8 Branch: refs/heads/trunk Commit: 39680ee87522b5ac15d3bde374b79c6a47f8ecc0 Parents: be6cb9d 2c9b82d Author: Benedict Elliott Smith <[email protected]> Authored: Tue Jun 16 16:37:10 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Tue Jun 16 16:37:10 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 24 ++++++++++++++++++++ .../db/compaction/CompactionManager.java | 7 +++++- .../cassandra/service/CassandraDaemon.java | 20 ++++------------ 4 files changed, 35 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39680ee8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39680ee8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39680ee8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39680ee8/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
