summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-09-24 08:42:05 +0100
committerMatthias Radestock <matthias@lshift.net>2009-09-24 08:42:05 +0100
commit9640c26cbd8488b0321ec96c350abf1e24f242f2 (patch)
treeff59bcb9281d4ffc32a34f1c1c8f3b1a3a89329b
parent978685e6e075a102776fb3a1cd799ea2a48024cc (diff)
parentcad0006cc066fd08a56d98a2a01124bba5a0fa3b (diff)
downloadrabbitmq-server-git-9640c26cbd8488b0321ec96c350abf1e24f242f2.tar.gz
merge bug21670 into default
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 57b2a7934d..c98a45ba24 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,7 @@ BASIC_SCRIPT_ENVIRONMENT_SETTINGS=\
run: all
$(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
RABBITMQ_ALLOW_INPUT=true \
- RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -s rabbit" \
+ RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS)" \
./scripts/rabbitmq-server
run-node: all