Repository: cassandra Updated Branches: refs/heads/trunk 67ed3375b -> 70360cf25
fix c* launch issues on Russian os's due to output of linux 'free' cmd patch by dbrosius reviewed by bwilliams for cassandra-6162 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16fd1a4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16fd1a4a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16fd1a4a Branch: refs/heads/trunk Commit: 16fd1a4a89958595ca2ae44fdac2eb7aa1ad6be2 Parents: fb0a78a Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Thu May 8 00:32:29 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Thu May 8 00:32:29 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- conf/cassandra-env.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/16fd1a4a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 6c8f1fb..05cc193 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,8 @@ 2.0.9 * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) - * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) + * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) 2.0.8 * Correctly delete scheduled range xfers (CASSANDRA-7143) http://git-wip-us.apache.org/repos/asf/cassandra/blob/16fd1a4a/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh index fc4fa3d..7604918 100644 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@ -18,7 +18,7 @@ calculate_heap_sizes() { case "`uname`" in Linux) - system_memory_in_mb=`free -m | awk '/Mem:/ {print $2}'` + system_memory_in_mb=`free -m | awk '/:/ {print $2;exit}'` system_cpu_cores=`egrep -c 'processor([[:space:]]+):.*' /proc/cpuinfo` ;; FreeBSD)
