diff options
| author | Simon MacMullen <simon@lshift.net> | 2010-05-10 16:39:01 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@lshift.net> | 2010-05-10 16:39:01 +0100 |
| commit | 4e12216ebecd90afc97ddfea31b6f4394e8bbfbd (patch) | |
| tree | dccaff833b0ba6a39618b4b21a47930aa61fc398 /scripts | |
| parent | 6324169a1041a601712c8dd12a36bfaed56b3cd4 (diff) | |
| parent | b57ebc9d104ab2db4b44b874181db1cf21ecd2c2 (diff) | |
| download | rabbitmq-server-git-4e12216ebecd90afc97ddfea31b6f4394e8bbfbd.tar.gz | |
Merge up to a8da11d231ff from default to amqp_0_9_1. This causes
testConnectionQueueSameNode to fail due to a race in recovering
exclusive queues (bug 22695). We'll need a fix from default, so
leaving as is for the time being.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 638498c1e2..ccdfc40160 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -31,7 +31,7 @@ ## NODENAME=rabbit -SERVER_ERL_ARGS="+K true +A30 \ +SERVER_ERL_ARGS="+K true +A30 +P 1048576 \ -kernel inet_default_listen_options [{nodelay,true}] \ -kernel inet_default_connect_options [{nodelay,true}]" CLUSTER_CONFIG_FILE=/etc/rabbitmq/rabbitmq_cluster.config diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 28eb8ebb8d..57fe1328ce 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -145,6 +145,7 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( -s rabbit ^
+W w ^
+A30 ^
++P 1048576 ^
-kernel inet_default_listen_options "[{nodelay, true}]" ^
-kernel inet_default_connect_options "[{nodelay, true}]" ^
!RABBITMQ_LISTEN_ARG! ^
|