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/71d9dba0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71d9dba0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71d9dba0 Branch: refs/heads/trunk Commit: 71d9dba063b0e669f12afef9fbb3efcb9cfacdd3 Parents: e43fbe0 535c3ac Author: Robert Stupp <[email protected]> Authored: Fri Oct 23 14:44:32 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Fri Oct 23 14:44:32 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 2 + .../cassandra/config/EncryptionOptions.java | 1 + .../org/apache/cassandra/transport/Server.java | 75 ++++++++++++++++++-- .../service/NativeTransportServiceTest.java | 18 +++++ 5 files changed, 90 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71d9dba0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 789a9d7,67e06ca..2ecad90 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.2 + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0 + * Support encrypted and plain traffic on the same port (CASSANDRA-10559) * Fix handling of range tombstones when reading old format sstables (CASSANDRA-10360) * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367) Merged from 2.2:
