Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9ead482 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9ead482 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9ead482 Branch: refs/heads/trunk Commit: c9ead4826a1dfb246b4ef6c916106bb13fcdbdc5 Parents: ddefb1d 66e2145 Author: Yuki Morishita <[email protected]> Authored: Tue Dec 13 15:59:23 2016 -0800 Committer: Yuki Morishita <[email protected]> Committed: Tue Dec 13 15:59:23 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 10 ++- .../cassandra/db/PartitionRangeReadCommand.java | 4 +- .../cassandra/db/compaction/CompactionTask.java | 81 ++++++++++---------- .../cassandra/db/lifecycle/LogTransaction.java | 3 +- .../apache/cassandra/db/lifecycle/Tracker.java | 34 ++++---- .../cassandra/index/SecondaryIndexManager.java | 4 +- .../db/lifecycle/LifecycleTransactionTest.java | 5 +- .../cassandra/db/lifecycle/TrackerTest.java | 6 +- .../org/apache/cassandra/tools/ToolsTester.java | 3 - 10 files changed, 85 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9ead482/CHANGES.txt ----------------------------------------------------------------------
