Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a47e4690 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a47e4690 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a47e4690 Branch: refs/heads/trunk Commit: a47e469058958c5d292ab778636f7fb5f554393e Parents: 72a0536 e23d1d9 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Tue May 31 09:41:56 2016 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Tue May 31 09:41:56 2016 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 13 ++++++++----- .../apache/cassandra/index/SecondaryIndexManager.java | 8 ++++---- .../org/apache/cassandra/index/CustomIndexTest.java | 11 +++++++++++ 3 files changed, 23 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
