summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2012-03-26 11:41:30 +0100
committerEmile Joubert <emile@rabbitmq.com>2012-03-26 11:41:30 +0100
commitf6d9f7d47f7ed534382789ec42612e40d47911e4 (patch)
treeddcc04c5384bff2e684c61bf3d3f08dd04a72611 /Makefile
parent41c63bda8acf97fa9a6ee4dc8507a962ca913755 (diff)
parentdf44a0dc98e591e1c92863264d925d4f8a3e844f (diff)
downloadrabbitmq-server-git-f6d9f7d47f7ed534382789ec42612e40d47911e4.tar.gz
Merge heads
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e8975856d4..d16cd4d058 100644
--- a/Makefile
+++ b/Makefile
@@ -216,12 +216,12 @@ start-rabbit-on-node: all
stop-rabbit-on-node: all
echo "rabbit:stop()." | $(ERL_CALL)
-set-memory-alarm: all
- echo "alarm_handler:set_alarm({{vm_memory_high_watermark, node()}, []})." | \
+set-resource-alarm: all
+ echo "alarm_handler:set_alarm({{resource_limit, $(SOURCE), node()}, []})." | \
$(ERL_CALL)
-clear-memory-alarm: all
- echo "alarm_handler:clear_alarm({vm_memory_high_watermark, node()})." | \
+clear-resource-alarm: all
+ echo "alarm_handler:clear_alarm({resource_limit, $(SOURCE), node()})." | \
$(ERL_CALL)
stop-node: