summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-03-21 10:42:41 +0000
committerSimon MacMullen <simon@rabbitmq.com>2013-03-21 10:42:41 +0000
commit06c3c514203278557cc8a9f356a3a443e49dfef1 (patch)
tree4e29c1d677aa3819d606c94072c2d363b9872ddb /src/rabbit.erl
parent563ffd53724177a8d2ce9544753de6bd8e9787e7 (diff)
parent77d144b31b1cce83eebe6e73a7c32d28dc8492bc (diff)
downloadrabbitmq-server-git-06c3c514203278557cc8a9f356a3a443e49dfef1.tar.gz
Merge in default
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index f3ba022ad3..3cfa21ba9b 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -236,7 +236,7 @@
{memory, any()}]).
-spec(is_running/0 :: () -> boolean()).
-spec(is_running/1 :: (node()) -> boolean()).
--spec(environment/0 :: () -> [{param() | term()}]).
+-spec(environment/0 :: () -> [{param(), term()}]).
-spec(rotate_logs/1 :: (file_suffix()) -> rabbit_types:ok_or_error(any())).
-spec(force_event_refresh/0 :: () -> 'ok').