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/8f189d11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f189d11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f189d11 Branch: refs/heads/trunk Commit: 8f189d1107b354cb1e820f0e4593712e0faee8c7 Parents: 746e9e4 cc4d759 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Nov 6 00:13:40 2015 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Nov 6 00:13:40 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/SizeEstimatesRecorder.java | 5 +++-- .../org/apache/cassandra/db/SystemKeyspace.java | 16 ---------------- .../apache/cassandra/service/StorageService.java | 5 +---- 4 files changed, 5 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f189d11/CHANGES.txt ----------------------------------------------------------------------
