diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-07-02 18:10:42 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-07-02 18:10:42 +0200 |
| commit | 9b5d2e21099250c9fa96a421e6af3e08cb270cf7 (patch) | |
| tree | 2ee52c45c4e5e1350f88cca8199f5c3db2ea92eb | |
| parent | 0c9cd74784d287d48a7cc1ddac4ae57c062a5dfc (diff) | |
| parent | 9fdbab196ba41501c330f6636e2a186317eb1079 (diff) | |
| download | rabbitmq-server-git-9b5d2e21099250c9fa96a421e6af3e08cb270cf7.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-defaults | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -234,7 +234,7 @@ run-background-node: all $(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \ RABBITMQ_NODE_ONLY=true \ RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \ - ./scripts/rabbitmq-server + ./scripts/rabbitmq-server -detached run-tests: all echo 'code:add_path("$(TEST_EBIN_DIR)").' | $(ERL_CALL) diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults index ad60734217..26f6af7cff 100644 --- a/scripts/rabbitmq-defaults +++ b/scripts/rabbitmq-defaults @@ -34,6 +34,6 @@ MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins PLUGINS_DIR="${RABBITMQ_HOME}/plugins" -IO_THREAD_POOL_SIZE=30 +IO_THREAD_POOL_SIZE=64 CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf |