diff --git a/CHANGES.txt b/CHANGES.txt index b1a556a000..837a5925f0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-1837) * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806) Merged from 2.2: + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946) * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813) * Add new types to Stress (CASSANDRA-9556) * Add property to allow listening on broadcast interface (CASSANDRA-9748) diff --git a/bin/cassandra b/bin/cassandra index 0bbd9fb4e3..c15c1abf4d 100755 --- a/bin/cassandra +++ b/bin/cassandra @@ -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 '^/'`"