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/45faed01 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45faed01 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45faed01 Branch: refs/heads/trunk Commit: 45faed0141add9e7a52c81f08a9e0ccc0d62d6c8 Parents: 7a4226f 99e0c90 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Aug 14 21:27:36 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Aug 14 21:27:36 2015 +0300 ---------------------------------------------------------------------- .../apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../cassandra/db/SizeEstimatesRecorder.java | 3 ++- .../org/apache/cassandra/db/lifecycle/View.java | 20 ++++++++++++---- .../apache/cassandra/dht/AbstractBounds.java | 25 ++++++++++++++++++++ src/java/org/apache/cassandra/dht/Bounds.java | 2 +- .../apache/cassandra/dht/ExcludingBounds.java | 2 +- .../cassandra/dht/IncludingExcludingBounds.java | 2 +- .../cassandra/streaming/StreamSession.java | 16 +++++++++---- .../apache/cassandra/db/lifecycle/ViewTest.java | 8 ++++--- 9 files changed, 63 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45faed01/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
