summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-04-22 11:31:01 +0100
committerMatthias Radestock <matthias@lshift.net>2009-04-22 11:31:01 +0100
commit616dc0bf7200a1edde083a6356205b781955bd24 (patch)
tree0570bee85dc3c02b642cf178f80efa3d249f33e2 /Makefile
parentb3281d4f188dd2b4ef2809dd98adcbc820d3b23e (diff)
parent040746724b76cc79c4816439d2cabc44a44740b9 (diff)
downloadrabbitmq-server-git-616dc0bf7200a1edde083a6356205b781955bd24.tar.gz
merge v1_5 into default
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index c352416aa1..4ff8573a23 100644
--- a/Makefile
+++ b/Makefile
@@ -94,11 +94,10 @@ run-node: all
run-tests: all
echo "rabbit_tests:all_tests()." | $(ERL_CALL)
-start-background-node: stop-node
+start-background-node:
$(BASIC_SCRIPT_ENVIRONMENT_SETTINGS) \
RABBITMQ_NODE_ONLY=true \
- RABBITMQ_SERVER_START_ARGS="$(RABBITMQ_SERVER_START_ARGS) -detached" \
- ./scripts/rabbitmq-server ; sleep 1
+ ./scripts/rabbitmq-server -detached; sleep 1
start-rabbit-on-node: all
echo "rabbit:start()." | $(ERL_CALL)