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/84db205b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84db205b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84db205b Branch: refs/heads/trunk Commit: 84db205b4143d5c937617db3c38d1fef5c263441 Parents: 001bdd3 6328590 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Feb 29 17:20:13 2016 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Feb 29 17:20:13 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/security/SSLFactory.java | 41 ++++++---- .../thrift/CustomTThreadPoolServer.java | 4 +- .../org/apache/cassandra/transport/Server.java | 3 +- .../cassandra/transport/SimpleClient.java | 3 +- test/conf/keystore.jks | Bin 0 -> 2191 bytes .../cassandra/security/SSLFactoryTest.java | 75 +++++++++++++++++++ 7 files changed, 108 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/84db205b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0c9eba1,a7b5c8a..744f06f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -51,6 -21,6 +51,7 @@@ Merged from 3.0 properly (CASSANDRA-11050) * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239) Merged from 2.2: ++ * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216) * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167) * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840) http://git-wip-us.apache.org/repos/asf/cassandra/blob/84db205b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java ----------------------------------------------------------------------
