Merge branch 'stable'

michaelklishin · michaelklishin · commit 77101e7fadaa · 2017-07-28T00:27:13.000+03:00
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
@@ -80,7 +80,7 @@ ESCRIPT_DIR="${RABBITMQ_HOME}/escript"
 DEFAULT_SCHEDULER_BIND_TYPE="db"
 [ "x" = "x$RABBITMQ_SCHEDULER_BIND_TYPE" ] && RABBITMQ_SCHEDULER_BIND_TYPE=${DEFAULT_SCHEDULER_BIND_TYPE}
 
-DEFAULT_DISTRIBUTION_BUFFER_SIZE=32000
+DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000
 [ "x" = "x$RABBITMQ_DISTRIBUTION_BUFFER_SIZE" ] && RABBITMQ_DISTRIBUTION_BUFFER_SIZE=${DEFAULT_DISTRIBUTION_BUFFER_SIZE}
 
 ## Common defaults
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
@@ -38,10 +38,10 @@ if "!RABBITMQ_SCHEDULER_BIND_TYPE!"=="" (
     set RABBITMQ_SCHEDULER_BIND_TYPE=!DEFAULT_SCHEDULER_BIND_TYPE!
 )
 
-REM DEFAULT_DISTRIBUTION_BUFFER_SIZE=32000
+REM DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000
 REM set the VM distribution buffer size
 REM [ "x" = "x$RABBITMQ_DISTRIBUTION_BUFFER_SIZE" ] && RABBITMQ_DISTRIBUTION_BUFFER_SIZE=${DEFAULT_DISTRIBUTION_BUFFER_SIZE}
-set DEFAULT_DISTRIBUTION_BUFFER_SIZE=32000
+set DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000
 if "!RABBITMQ_DISTRIBUTION_BUFFER_SIZE!"=="" (
     set RABBITMQ_DISTRIBUTION_BUFFER_SIZE=!DEFAULT_DISTRIBUTION_BUFFER_SIZE!
 )

Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,10 @@ if "!RABBITMQ_SCHEDULER_BIND_TYPE!"=="" (`
`38`	`38`	`set RABBITMQ_SCHEDULER_BIND_TYPE=!DEFAULT_SCHEDULER_BIND_TYPE!`
`39`	`39`	`)`
`40`	`40`
`41`		`-REM DEFAULT_DISTRIBUTION_BUFFER_SIZE=32000`
	`41`	`+REM DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000`
`42`	`42`	`REM set the VM distribution buffer size`
`43`	`43`	`REM [ "x" = "x$RABBITMQ_DISTRIBUTION_BUFFER_SIZE" ] && RABBITMQ_DISTRIBUTION_BUFFER_SIZE=${DEFAULT_DISTRIBUTION_BUFFER_SIZE}`
`44`		`-set DEFAULT_DISTRIBUTION_BUFFER_SIZE=32000`
	`44`	`+set DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000`
`45`	`45`	`if "!RABBITMQ_DISTRIBUTION_BUFFER_SIZE!"=="" (`
`46`	`46`	`set RABBITMQ_DISTRIBUTION_BUFFER_SIZE=!DEFAULT_DISTRIBUTION_BUFFER_SIZE!`
`47`	`47`	`)`