Merge branch 'stable'

rabbitmq · Feb 10, 2016 · b69f3e7 · b69f3e7
2 parents 0120438 + 5d9d074
commit b69f3e7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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()).