Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e8968bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e8968bc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e8968bc Branch: refs/heads/trunk Commit: 3e8968bc8e0b719b70252884f4559711fcd67bce Parents: 670b6c6 591cd9e Author: Sam Tunnicliffe <[email protected]> Authored: Wed Jan 27 11:30:21 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Wed Jan 27 11:30:21 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 4 +- .../org/apache/cassandra/db/LegacyLayout.java | 2 +- .../index/internal/CassandraIndex.java | 39 ++++++++++++++++---- 3 files changed, 35 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e8968bc/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e8968bc/src/java/org/apache/cassandra/db/LegacyLayout.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e8968bc/src/java/org/apache/cassandra/index/internal/CassandraIndex.java ----------------------------------------------------------------------
