Merge branch 'cassandra-3.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/c20f6b37 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c20f6b37 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c20f6b37 Branch: refs/heads/trunk Commit: c20f6b374bc93e08cc5e6a65784e25185e386d9d Parents: 6ef817a e1fb18a Author: Marcus Eriksson <[email protected]> Authored: Fri Oct 16 12:31:24 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Fri Oct 16 12:31:24 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 12 ++++++++---- .../db/compaction/AbstractCompactionStrategy.java | 6 +++++- 2 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c20f6b37/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
