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/eaf0e352 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eaf0e352 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eaf0e352 Branch: refs/heads/trunk Commit: eaf0e35233babae6176a73439a38bb0e866c64e8 Parents: 083815e 24682d2 Author: Sylvain Lebresne <[email protected]> Authored: Fri Sep 4 11:16:23 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Sep 4 11:16:23 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/db/ReadResponse.java | 38 +++++++- .../org/apache/cassandra/db/Serializers.java | 65 ++++++++++++- .../db/SinglePartitionNamesCommand.java | 2 +- .../columniterator/AbstractSSTableIterator.java | 36 ++++++- .../db/columniterator/SSTableIterator.java | 4 +- .../columniterator/SSTableReversedIterator.java | 35 +++++-- .../cassandra/db/marshal/CompositeType.java | 5 + .../cassandra/io/sstable/IndexHelper.java | 6 +- .../apache/cassandra/db/ReadResponseTest.java | 99 ++++++++++++++++++++ 10 files changed, 266 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eaf0e352/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ef6509c,4d8a932..84eed2a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,6 +1,10 @@@ +3.2 + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0.0-beta2 + * Fix backward compatibility issue due to AbstractBounds serialization bug (CASSANDRA-9857) + * Fix startup error when upgrading nodes (CASSANDRA-10136) * Base table PRIMARY KEY can be assumed to be NOT NULL in MV creation (CASSANDRA-10147) * Improve batchlog write patch (CASSANDRA-9673) * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164)
