cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [06/12] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Thu, 20 Oct 2016 14:48:27 GMT
Merge branch 'cassandra-3.X' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1f20619
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1f20619
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1f20619

Branch: refs/heads/trunk
Commit: a1f206190f1f861e0becff0ce9372e04826cbae5
Parents: cb8e951 23bfcab
Author: Yuki Morishita <yukim@apache.org>
Authored: Thu Oct 20 09:45:40 2016 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Thu Oct 20 09:45:40 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/security/SSLFactory.java   | 53 ++++++++++++++++----
 2 files changed, 43 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1f20619/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 95847d0,cc82dea..e1abd52
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -91,8 -84,9 +91,9 @@@
   * Remove pre-startup check for open JMX port (CASSANDRA-12074)
   * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
   * Restore resumable hints delivery (CASSANDRA-11960)
 - * Properly report LWT contention (CASSANDRA-12626)
 + * Properly record CAS contention (CASSANDRA-12626)
  Merged from 3.0:
+  * Fix potential socket leak (CASSANDRA-12329)
   * Fix ViewTest.testCompaction (CASSANDRA-12789)
   * Improve avg aggregate functions (CASSANDRA-12417)
   * Preserve quoted reserved keyword column names in MV creation (CASSANDRA-11803)


Mime
View raw message