cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mshu...@apache.org
Subject [15/15] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Date Thu, 16 Feb 2017 00:02:38 GMT
Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: ad316820be0ac9caa2ddc228e257fb4fceb70675
Parents: d81dc27 ad70202
Author: Michael Shuler <michael@pbandjelly.org>
Authored: Wed Feb 15 18:00:24 2017 -0600
Committer: Michael Shuler <michael@pbandjelly.org>
Committed: Wed Feb 15 18:00:24 2017 -0600

----------------------------------------------------------------------
 CHANGES.txt   | 1 +
 bin/cassandra | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad316820/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0a76400,1a9ce2d..adc1503
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -55,11 -23,10 +55,12 @@@ Merged from 2.2
   * Fix negative mean latency metric (CASSANDRA-12876)
   * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
  Merged from 2.1:
+  * Use portable stderr for java error in startup (CASSANDRA-13211)
   * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Upgrade netty version to fix memory leak with client encryption (CASSANDRA-13114)
   * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
  
 +
  3.10
   * Fix secondary index queries regression (CASSANDRA-13013)
   * Add duration type to the protocol V5 (CASSANDRA-12850)


Mime
View raw message