Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32817b21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32817b21 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32817b21 Branch: refs/heads/trunk Commit: 32817b21ad0ba82cec328cfd0ea096fe6acff69b Parents: e37efea 715c151 Author: Sam Tunnicliffe <[email protected]> Authored: Wed Aug 26 09:33:17 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Wed Aug 26 09:33:17 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../cassandra/index/SecondaryIndexManager.java | 8 +- .../index/internal/CustomCassandraIndex.java | 738 +++++++++++++++++++ .../index/internal/CustomIndexTest.java | 20 + 5 files changed, 764 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32817b21/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5a84d63,2643bfc..ee7ac0a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ +3.2 + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0.0-beta2 + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181) * Fix double flushing of secondary index tables (CASSANDRA-10180) * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046) * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061) http://git-wip-us.apache.org/repos/asf/cassandra/blob/32817b21/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
