summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGiuseppe Privitera <priviterag@gmail.com>2015-09-03 09:55:25 +0100
committerGiuseppe Privitera <priviterag@gmail.com>2015-09-03 10:08:56 +0100
commitd8b9264bdb7f3a1cce639a3dbdb50cb588a3593e (patch)
treef40a69dc477033f467e945e418d8cd65f461ec19 /src
parentf1377540aa410eb26a2f8e7fae489044d6636b7b (diff)
downloadrabbitmq-server-git-d8b9264bdb7f3a1cce639a3dbdb50cb588a3593e.tar.gz
fix erlang -spec definition for pset, pmerge and plmerge
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_misc.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index b45d600217..759e066bf2 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -227,9 +227,9 @@
-spec(pget/2 :: (term(), [term()]) -> term()).
-spec(pget/3 :: (term(), [term()], term()) -> term()).
-spec(pget_or_die/2 :: (term(), [term()]) -> term() | no_return()).
--spec(pmerge/3 :: (term(), term(), [term()]) -> term()).
--spec(plmerge/2 :: ([term()], [term()]) -> term()).
--spec(pset/3 :: (term(), term(), [term()]) -> term()).
+-spec(pmerge/3 :: (term(), term(), [term()]) -> [term()]).
+-spec(plmerge/2 :: ([term()], [term()]) -> [term()]).
+-spec(pset/3 :: (term(), term(), [term()]) -> [term()]).
-spec(format_message_queue/2 :: (any(), priority_queue:q()) -> term()).
-spec(append_rpc_all_nodes/4 :: ([node()], atom(), atom(), [any()]) -> [any()]).
-spec(os_cmd/1 :: (string()) -> string()).