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

jemalloc detection fails due to quoting issues in regex 

patch by Bernhard K. Weisshuhn; reviewed by Robert Stupp for CASSANDRA-10946
This commit is contained in:
Bernhard K. Weisshuhn 2015-12-29 15:31:33 +01:00 committed by Robert Stupp
parent 450091bfb8
commit f9ac657456
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

@ -1,4 +1,5 @@
2.2.5
* jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
* Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
* (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
* Add new types to Stress (CASSANDRA-9556)

2
bin/cassandra
View File

@ -153,7 +153,7 @@ case "`uname -s`" in
which ldconfig > /dev/null 2>&1
if [ $? = 0 ] ; then
# e.g. for CentOS
dirs="/lib64 /lib /usr/lib64 /usr/lib `ldconfig -v 2>/dev/null | grep -v ^$'\t' | sed 's/^\([^:]*\):.*$/\1/'`"
dirs="/lib64 /lib /usr/lib64 /usr/lib `ldconfig -v 2>/dev/null | grep -v '^\s' | sed 's/^\([^:]*\):.*$/\1/'`"
else
# e.g. for Debian, OpenSUSE
dirs="/lib64 /lib /usr/lib64 /usr/lib `cat /etc/ld.so.conf /etc/ld.so.conf.d/*.conf | grep '^/'`"