Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cafccfc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cafccfc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cafccfc Branch: refs/heads/trunk Commit: 0cafccfc5ce80fc91817de6a5cd74702836de508 Parents: 1fe90d3 0de23f2 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Nov 11 16:16:44 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Nov 11 16:16:44 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 34 +++++++++++ .../db/compaction/CompactionController.java | 5 -- src/java/org/apache/cassandra/dht/Bounds.java | 62 ++++++++++++++++++++ .../cassandra/streaming/StreamReader.java | 12 ++-- .../cassandra/streaming/StreamReceiveTask.java | 37 +++++++++++- .../compress/CompressedStreamReader.java | 2 +- .../apache/cassandra/db/CounterCacheTest.java | 48 +++++++++++++++ .../org/apache/cassandra/db/RowCacheTest.java | 50 ++++++++++++++++ .../org/apache/cassandra/dht/BoundsTest.java | 61 +++++++++++++++++++ 10 files changed, 298 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cafccfc/CHANGES.txt ----------------------------------------------------------------------