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/7a7fb8e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a7fb8e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a7fb8e3 Branch: refs/heads/trunk Commit: 7a7fb8e362d22d9b519893b2b0ab14ce5ab839ff Parents: b8a1547 4f4918f Author: Sam Tunnicliffe <s...@beobal.com> Authored: Thu Oct 8 10:55:28 2015 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Thu Oct 8 10:55:28 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/index/SecondaryIndexManager.java | 6 +- .../validation/entities/SecondaryIndexTest.java | 80 ++++++++++++++++++++ .../org/apache/cassandra/index/StubIndex.java | 1 + 4 files changed, 85 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a7fb8e3/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a050d59,6eb56ec..95f5ae9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ +3.2 + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0 + * Only include modified cell data in indexing deltas (CASSANDRA-10438) * Do not load keyspace when creating sstable writer (CASSANDRA-10443) * If node is not yet gossiping write all MV updates to batchlog only (CASSANDRA-10413) * Re-populate token metadata after commit log recovery (CASSANDRA-10293) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a7fb8e3/test/unit/org/apache/cassandra/index/StubIndex.java ----------------------------------------------------------------------
