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

Merge branch 'cassandra-2.1' into cassandra-2.2

This commit is contained in:
Michael Shuler 2017-02-15 17:57:03 -06:00
parent 753d90cd77 cb090791c3
commit 0b9f6de7a8
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

@ -31,6 +31,7 @@
* Split consistent range movement flag correction (CASSANDRA-12786)
* CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979)
Merged from 2.1:
* Use portable stderr for java error in startup (CASSANDRA-13211)
* Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
* Coalescing strategy can enter infinite loop (CASSANDRA-13159)
* Upgrade netty version to fix memory leak with client encryption (CASSANDRA-13114)

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