Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 fe62557ef -> 36608cefa
jemalloc detection fails due to quoting issues in regex patch by Bernhard K. Weisshuhn; reviewed by Robert Stupp for CASSANDRA-10946 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f9ac6574 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f9ac6574 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f9ac6574 Branch: refs/heads/cassandra-3.0 Commit: f9ac6574561cccd6d829832166ef117ff6b7c5d2 Parents: 450091b Author: Bernhard K. Weisshuhn <b...@codingforce.com> Authored: Tue Dec 29 15:31:33 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Tue Dec 29 15:31:33 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9ac6574/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 82af7fc..23d6bae 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9ac6574/bin/cassandra ---------------------------------------------------------------------- diff --git a/bin/cassandra b/bin/cassandra index 0bbd9fb..c15c1ab 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 '^/'`"
