summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2010-08-03 13:11:48 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2010-08-03 13:11:48 +0100
commita549c6f23b4e468c9cd2766a03e5230dc9dba854 (patch)
tree5df29570f5ff7bf0ac0d893c0b1bd3bd06a66419
parentd6e40e19762e63eab49f31113b81ba3808fad24d (diff)
parent98831545b0205444b69de77bb617434714b3212e (diff)
downloadrabbitmq-server-git-a549c6f23b4e468c9cd2766a03e5230dc9dba854.tar.gz
Merging default into bug 15930
-rw-r--r--src/rabbit_types.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_types.erl b/src/rabbit_types.erl
index 02334f27b1..a9313503a1 100644
--- a/src/rabbit_types.erl
+++ b/src/rabbit_types.erl
@@ -137,7 +137,7 @@
-type(connection() :: pid()).
--type(protocol() :: atom()).
+-type(protocol() :: 'rabbit_framing_amqp_0_8' | 'rabbit_framing_amqp_0_9_1').
-type(user() ::
#user{username :: rabbit_access_control:username(),