Merge branch 'cassandra-3.0' 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/e23d1d92 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e23d1d92 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e23d1d92 Branch: refs/heads/cassandra-3.7 Commit: e23d1d92697c162a9a89b39afdd1875c2d7044cb Parents: 4e25524 81ffc46 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Tue May 31 09:40:00 2016 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Tue May 31 09:40:00 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e23d1d92/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e23d1d92/src/java/org/apache/cassandra/index/SecondaryIndexManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e23d1d92/test/unit/org/apache/cassandra/index/CustomIndexTest.java ----------------------------------------------------------------------
