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/0f980e5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f980e5a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f980e5a Branch: refs/heads/trunk Commit: 0f980e5a20359114c9c408f5b46e83d5b8235f4d Parents: 32817b2 70819bf Author: Sylvain Lebresne <[email protected]> Authored: Wed Aug 26 10:53:14 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Aug 26 10:53:14 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/auth/CassandraAuthorizer.java | 2 +- .../apache/cassandra/db/marshal/MapType.java | 2 +- .../apache/cassandra/db/marshal/SetType.java | 2 +- .../cassandra/serializers/MapSerializer.java | 29 ++++++++++++++++---- .../cassandra/serializers/SetSerializer.java | 10 +++++-- 6 files changed, 34 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f980e5a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ee7ac0a,5fb6874..5cf9796 --- 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 + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162) * 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)
