summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-04-02 15:00:33 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-04-02 15:00:33 +0100
commit81d6fedfbf64b5141a4e0d9f7f0dff18d89d860c (patch)
tree9318355f2cec2e8cb1d120dc16934861e8301b38 /Makefile
parentc49f49b27f6309cb768290a753779ce6731c297a (diff)
parent85dd778d974c73d70950c773bf8c944d04af0fc2 (diff)
downloadrabbitmq-server-git-81d6fedfbf64b5141a4e0d9f7f0dff18d89d860c.tar.gz
Merge bug24808.
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: