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/ef54c6c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef54c6c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef54c6c7 Branch: refs/heads/trunk Commit: ef54c6c72f863bcf7211925efc38773307fc56a7 Parents: acb8fbb 7f5580b Author: Sam Tunnicliffe <[email protected]> Authored: Tue Sep 15 11:22:24 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Tue Sep 15 11:22:24 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/index/Index.java | 13 ++++ .../cassandra/index/SecondaryIndexManager.java | 19 ++++-- .../index/internal/CassandraIndex.java | 6 ++ .../org/apache/cassandra/index/StubIndex.java | 5 ++ .../index/internal/CustomCassandraIndex.java | 5 ++ .../index/internal/CustomIndexTest.java | 67 +++++++++++++++++++- 7 files changed, 109 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef54c6c7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6e04690,cf982dd..ee1aa69 --- 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-rc1 + * Give index implementations more control over rebuild operations (CASSANDRA-10312) * Update index file format (CASSANDRA-10314) * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261) * CFS.loadNewSSTables() broken for pre-3.0 sstables
