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/721eaf6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/721eaf6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/721eaf6f Branch: refs/heads/trunk Commit: 721eaf6f0eabadb77da27a8765c7884415a1337b Parents: 737b3d0 520089b Author: Sylvain Lebresne <[email protected]> Authored: Fri Sep 4 15:46:55 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Sep 4 15:46:55 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/PartitionColumns.java | 14 ++++++ .../db/partitions/AbstractBTreePartition.java | 33 ++++++++------ .../db/partitions/AtomicBTreePartition.java | 7 ++- .../db/partitions/CachedBTreePartition.java | 5 +-- .../db/partitions/FilteredPartition.java | 4 +- .../db/partitions/ImmutableBTreePartition.java | 10 ++--- .../db/partitions/PartitionUpdate.java | 45 +++++++++++--------- 8 files changed, 70 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/721eaf6f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 84eed2a,e4c5258..e726ada --- 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 + * Fix columns returned by AbstractBtreePartitions (CASSANDRA-10220) * 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)
