summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2016-02-10 16:51:38 +0300
committerMichael Klishin <michael@clojurewerkz.org>2016-02-10 16:51:38 +0300
commitb69f3e7a8f2957d29614f2ae4bd861e00ccb8fed (patch)
tree8e5d486a772fd3e750127188f5749fd8aceb590e /src
parent0120438b9441e6c4c1d650bf03e9e4995d9cab83 (diff)
parent5d9d07476a85993b082bed651afdc6103be57af8 (diff)
downloadrabbitmq-server-git-b69f3e7a8f2957d29614f2ae4bd861e00ccb8fed.tar.gz
Merge branch 'stable'
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_alarm.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl
index c11b6e4383..30743ea243 100644
--- a/src/rabbit_alarm.erl
+++ b/src/rabbit_alarm.erl
@@ -50,7 +50,7 @@
alarms :: [alarm()]}).
-type(local_alarm() :: 'file_descriptor_limit').
--type(resource_alarm_source() :: 'disk' | 'node').
+-type(resource_alarm_source() :: 'disk' | 'memory').
-type(resource_alarm() :: {resource_limit, resource_alarm_source(), node()}).
-type(alarm() :: local_alarm() | resource_alarm()).