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/33152d83 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33152d83 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33152d83 Branch: refs/heads/trunk Commit: 33152d83ca6d45ca3a97e93b0b8c79c98074d0ae Parents: be7eb4a d996c36 Author: Marcus Eriksson <[email protected]> Authored: Thu Sep 10 08:38:03 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu Sep 10 08:38:03 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/io/sstable/IndexSummaryManager.java | 4 ++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/33152d83/CHANGES.txt ----------------------------------------------------------------------
