Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00c31a24 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00c31a24 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00c31a24 Branch: refs/heads/cassandra-3.1 Commit: 00c31a24cb78d98ffc075bd0dcca0b3c6e6a705e Parents: 88892af 5730e7b Author: Sam Tunnicliffe <[email protected]> Authored: Fri Nov 13 17:50:57 2015 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Fri Nov 13 17:50:57 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/index/SecondaryIndexManager.java | 7 ++++- .../apache/cassandra/index/CustomIndexTest.java | 33 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/00c31a24/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index cd78818,f214200..6aff321 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.1 +3.1 +Merged from 3.0: + * Notify indexers of partition delete during cleanup (CASSANDRA-10685) * Keep the file open in trySkipCache (CASSANDRA-10669) * Updated trigger example (CASSANDRA-10257) Merged from 2.2:
