natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Michael Shuler 2017-02-15 18:00:24 -06:00
parent d81dc27c7b ad70202783
commit ad316820be
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -55,6 +55,7 @@ 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)

2
bin/cassandra
View File

@ -99,7 +99,7 @@ else
fi
if [ -z $JAVA ] ; then
echo Unable to find java executable. Check JAVA_HOME and PATH environment variables. > /dev/stderr
echo Unable to find java executable. Check JAVA_HOME and PATH environment variables. >&2
exit 1;
fi