summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-11-25 21:53:15 +0000
committerMatthias Radestock <matthias@lshift.net>2009-11-25 21:53:15 +0000
commit90d747e73fa9aa33f77f5d5cdc01ad27f0fe2ea9 (patch)
treef59bc7f8a6f82d176527e3f4065cc6dd89aacdeb
parent6a2901709a33998d27ad2add7e3e838a105d4212 (diff)
parentb8892e9842e6e46bdc6ad2734e4ea364b6cbafbf (diff)
downloadrabbitmq-server-git-90d747e73fa9aa33f77f5d5cdc01ad27f0fe2ea9.tar.gz
merge default into bug21673
-rw-r--r--src/vm_memory_monitor.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index 33ff53b1ae..495eff6925 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -74,7 +74,8 @@
-ifdef(use_specs).
--spec(start_link/1 :: (float()) -> ('ignore' | {'error', any()} | {'ok', pid()})).
+-spec(start_link/1 :: (float()) ->
+ ('ignore' | {'error', any()} | {'ok', pid()})).
-spec(update/0 :: () -> 'ok').
-spec(get_total_memory/0 :: () -> (non_neg_integer() | 'unknown')).
-spec(get_memory_limit/0 :: () -> (non_neg_integer() | 'undefined')).