cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [12/12] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Thu, 20 Oct 2016 14:48:33 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/0695307d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0695307d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0695307d

Branch: refs/heads/trunk
Commit: 0695307d80cbebc98a626f9788d3ca20847a2314
Parents: a1f2061 78f1807
Author: Yuki Morishita <yukim@apache.org>
Authored: Thu Oct 20 09:47:59 2016 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Thu Oct 20 09:47:59 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                                              |  2 +-
 .../cassandra/streaming/DefaultConnectionFactory.java    | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0695307d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e1abd52,e37f095..94d13d5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -91,9 -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 potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
   * 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