diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-04-24 14:46:49 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-04-24 14:46:49 +0100 |
| commit | 3e1deb156086fa71c246f160d79b055b99978921 (patch) | |
| tree | cd20974ac94506bbfc37a8c6c2e7724cb8e4a5e9 /include | |
| parent | ffcbd1220b02de9c78aa4cef40e90b46b4100ec6 (diff) | |
| parent | d4d6e415612253469532409b5e74aa9f12657fce (diff) | |
| download | rabbitmq-server-git-3e1deb156086fa71c246f160d79b055b99978921.tar.gz | |
Merged stable into default
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 19766a0022..4282755df5 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -27,9 +27,6 @@ -record(vhost, {virtual_host, dummy}). --record(connection, {protocol, user, timeout_sec, frame_max, vhost, - client_properties, capabilities}). - -record(content, {class_id, properties, %% either 'none', or a decoded record/tuple @@ -43,7 +40,7 @@ -record(resource, {virtual_host, kind, name}). -record(exchange, {name, type, durable, auto_delete, internal, arguments, - scratches, policy}). + scratches, policy, decorators}). -record(exchange_serial, {name, next}). -record(amqqueue, {name, durable, auto_delete, exclusive_owner = none, @@ -78,8 +75,7 @@ -record(event, {type, props, timestamp}). --record(message_properties, {expiry, needs_confirming = false, - delivered = false}). +-record(message_properties, {expiry, needs_confirming = false}). -record(plugin, {name, %% atom() version, %% string() @@ -92,7 +88,6 @@ -define(COPYRIGHT_MESSAGE, "Copyright (C) 2007-2013 VMware, Inc."). -define(INFORMATION_MESSAGE, "Licensed under the MPL. See http://www.rabbitmq.com/"). --define(PROTOCOL_VERSION, "AMQP 0-9-1 / 0-9 / 0-8"). -define(ERTS_MINIMUM, "5.6.3"). %% EMPTY_FRAME_SIZE, 8 = 1 + 2 + 4 + 1 |