You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/08/13 20:30:11 UTC
[1/7] git commit: export MALLOC_ARENA_MAX corrrectly
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 74f3204c6 -> efde6ae81
refs/heads/cassandra-2.1 88ad4f451 -> aab471179
refs/heads/cassandra-2.1.0 0623ea86a -> ed3694b86
refs/heads/trunk c61784cd8 -> 5d6d89199
export MALLOC_ARENA_MAX corrrectly
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6126
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efde6ae8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efde6ae8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efde6ae8
Branch: refs/heads/cassandra-2.0
Commit: efde6ae81be455eab31c7a0033d67b6df4e19391
Parents: 74f3204
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 13 13:28:28 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 13 13:28:28 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/efde6ae8/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 5e2fb87..c4c8bd5 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -139,7 +139,7 @@ esac
#HEAP_NEWSIZE="800M"
# Set this to control the amount of arenas per-thread in glibc
-#MALLOC_ARENA_MAX=4
+#export MALLOC_ARENA_MAX=4
if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then
calculate_heap_sizes
@@ -152,7 +152,7 @@ fi
if [ "x$MALLOC_ARENA_MAX" = "x" ]
then
- MALLOC_ARENA_MAX=4
+ export MALLOC_ARENA_MAX=4
fi
# Specifies the default port over which Cassandra will be available for
[7/7] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d6d8919
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d6d8919
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d6d8919
Branch: refs/heads/trunk
Commit: 5d6d8919960a05f6524c195d70e1d4fd8387c83f
Parents: c61784c aab4711
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 13 13:30:05 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 13 13:30:05 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[6/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aab47117
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aab47117
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aab47117
Branch: refs/heads/cassandra-2.1
Commit: aab4711795adf563cc2decfa4ab5267b8e1a1d9a
Parents: 88ad4f4 efde6ae
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 13 13:29:53 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 13 13:29:53 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aab47117/conf/cassandra-env.sh
----------------------------------------------------------------------
[5/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aab47117
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aab47117
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aab47117
Branch: refs/heads/trunk
Commit: aab4711795adf563cc2decfa4ab5267b8e1a1d9a
Parents: 88ad4f4 efde6ae
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 13 13:29:53 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 13 13:29:53 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aab47117/conf/cassandra-env.sh
----------------------------------------------------------------------
[2/7] git commit: export MALLOC_ARENA_MAX corrrectly
Posted by br...@apache.org.
export MALLOC_ARENA_MAX corrrectly
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6126
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efde6ae8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efde6ae8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efde6ae8
Branch: refs/heads/cassandra-2.1
Commit: efde6ae81be455eab31c7a0033d67b6df4e19391
Parents: 74f3204
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 13 13:28:28 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 13 13:28:28 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/efde6ae8/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 5e2fb87..c4c8bd5 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -139,7 +139,7 @@ esac
#HEAP_NEWSIZE="800M"
# Set this to control the amount of arenas per-thread in glibc
-#MALLOC_ARENA_MAX=4
+#export MALLOC_ARENA_MAX=4
if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then
calculate_heap_sizes
@@ -152,7 +152,7 @@ fi
if [ "x$MALLOC_ARENA_MAX" = "x" ]
then
- MALLOC_ARENA_MAX=4
+ export MALLOC_ARENA_MAX=4
fi
# Specifies the default port over which Cassandra will be available for
[4/7] git commit: export MALLOC_ARENA_MAX corrrectly
Posted by br...@apache.org.
export MALLOC_ARENA_MAX corrrectly
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6126
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed3694b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed3694b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed3694b8
Branch: refs/heads/cassandra-2.1.0
Commit: ed3694b868cdfbf674445f878477d9f7589ba86e
Parents: 0623ea8
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 13 13:28:28 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 13 13:29:42 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed3694b8/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 211b81b..43a121c 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -144,7 +144,7 @@ esac
#HEAP_NEWSIZE="800M"
# Set this to control the amount of arenas per-thread in glibc
-#MALLOC_ARENA_MAX=4
+#export MALLOC_ARENA_MAX=4
if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then
calculate_heap_sizes
@@ -157,7 +157,7 @@ fi
if [ "x$MALLOC_ARENA_MAX" = "x" ]
then
- MALLOC_ARENA_MAX=4
+ export MALLOC_ARENA_MAX=4
fi
# Specifies the default port over which Cassandra will be available for
[3/7] git commit: export MALLOC_ARENA_MAX corrrectly
Posted by br...@apache.org.
export MALLOC_ARENA_MAX corrrectly
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6126
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efde6ae8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efde6ae8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efde6ae8
Branch: refs/heads/trunk
Commit: efde6ae81be455eab31c7a0033d67b6df4e19391
Parents: 74f3204
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 13 13:28:28 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 13 13:28:28 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/efde6ae8/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 5e2fb87..c4c8bd5 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -139,7 +139,7 @@ esac
#HEAP_NEWSIZE="800M"
# Set this to control the amount of arenas per-thread in glibc
-#MALLOC_ARENA_MAX=4
+#export MALLOC_ARENA_MAX=4
if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then
calculate_heap_sizes
@@ -152,7 +152,7 @@ fi
if [ "x$MALLOC_ARENA_MAX" = "x" ]
then
- MALLOC_ARENA_MAX=4
+ export MALLOC_ARENA_MAX=4
fi
# Specifies the default port over which Cassandra will be available for