summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-04-02 18:29:05 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2012-04-02 18:29:05 +0100
commit856348b89f0ad31f569bc13990bee93f3ffe4bfb (patch)
tree41e723f52f9e08a6d6b39c595f1fd2b51d54fb82 /Makefile
parentfd0b3c9623ee9e97178a98c93b67bdda48ad4ee3 (diff)
parent22e42f97bff785d420744c80063b19d5e7439b4a (diff)
downloadrabbitmq-server-git-856348b89f0ad31f569bc13990bee93f3ffe4bfb.tar.gz
merge default into bug24725
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: