summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bakken <lbakken@pivotal.io>2018-02-23 12:49:51 -0800
committerLuke Bakken <lbakken@pivotal.io>2018-02-23 12:49:51 -0800
commitf38e9c4f44892ee6fb4c78d51e7124e20a6de61a (patch)
treebc1cb3d92ba2329c1512c7355200bfa9606ac285
parent394d02876c54db356441a666ef40eaab42da1654 (diff)
downloadrabbitmq-server-git-f38e9c4f44892ee6fb4c78d51e7124e20a6de61a.tar.gz
Remove merge artifact
-rwxr-xr-xscripts/rabbitmq-env6
1 files changed, 0 insertions, 6 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index fbc4c6f68d..71b498671b 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -97,12 +97,6 @@ DEFAULT_MAX_NUMBER_OF_ATOMS=5000000
[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_ATOMS" ] && RABBITMQ_MAX_NUMBER_OF_ATOMS="$MAX_NUMBER_OF_ATOMS"
[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_ATOMS" ] && RABBITMQ_MAX_NUMBER_OF_ATOMS="$DEFAULT_MAX_NUMBER_OF_ATOMS"
-DEFAULT_MAX_NUMBER_OF_PROCESSES=1048576
-[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_PROCESSES" ] && RABBITMQ_MAX_NUMBER_OF_PROCESSES=="${DEFAULT_MAX_NUMBER_OF_PROCESSES}"
-
-DEFAULT_MAX_NUMBER_OF_ATOMS=5000000
-[ "x" = "x$RABBITMQ_MAX_NUMBER_OF_ATOMS" ] && RABBITMQ_MAX_NUMBER_OF_ATOMS=="${DEFAULT_MAX_NUMBER_OF_ATOMS}"
-
## Common server defaults
SERVER_ERL_ARGS="+P $RABBITMQ_MAX_NUMBER_OF_PROCESSES +t $RABBITMQ_MAX_NUMBER_OF_ATOMS +stbt $RABBITMQ_SCHEDULER_BIND_TYPE +zdbbl $RABBITMQ_DISTRIBUTION_BUFFER_SIZE"