Merge branch 'cassandra-3.6' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e255244 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e255244 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e255244 Branch: refs/heads/trunk Commit: 4e255244ea8757c0a0db8823994a5a529cd7129c Parents: ac62a60 8d22d9f Author: Robert Stupp <sn...@snazy.de> Authored: Mon May 30 17:44:15 2016 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Mon May 30 17:44:15 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../org/apache/cassandra/db/RowIndexEntry.java | 48 +++++++++++++++----- .../cassandra/io/sstable/LegacySSTableTest.java | 42 +++++++++++++++++ 3 files changed, 80 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e255244/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e255244/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java ----------------------------------------------------------------------
