You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/01/06 14:45:16 UTC
[2/6] cassandra git commit: Revert wrong line removal from bad merge
Revert wrong line removal from bad merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f937c8be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f937c8be
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f937c8be
Branch: refs/heads/cassandra-3.3
Commit: f937c8bee87666ac1ba1ac96e0c7803629cc3508
Parents: 12b6c0a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jan 6 14:44:29 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jan 6 14:44:29 2016 +0100
----------------------------------------------------------------------
conf/cassandra-env.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f937c8be/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index f322803..83fe4c5 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -33,7 +33,7 @@ calculate_heap_sizes()
Darwin)
system_memory_in_bytes=`sysctl hw.memsize | awk '{print $2}'`
system_memory_in_mb=`expr $system_memory_in_bytes / 1024 / 1024`
-
+ system_cpu_cores=`sysctl hw.ncpu | awk '{print $2}'`
;;
*)
# assume reasonable defaults for e.g. a modern desktop or