diff options
| author | Tim Watson <tim@rabbitmq.com> | 2013-03-07 15:10:49 +0000 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2013-03-07 15:10:49 +0000 |
| commit | c3ff3a26c3c82ba798b1464ef18abc518f3a9509 (patch) | |
| tree | ca9872a1db5f9fdee5e3ba58af9cfe0c250f60cb /include | |
| parent | da0756242b2a6790ef975cf36ea48e8b064c4dda (diff) | |
| parent | 2e665ace9e3202b0e89fdfb6910b74b9646e88ff (diff) | |
| download | rabbitmq-server-git-c3ff3a26c3c82ba798b1464ef18abc518f3a9509.tar.gz | |
merge default into bug23958
Diffstat (limited to 'include')
| -rw-r--r-- | include/gm_specs.hrl | 2 | ||||
| -rw-r--r-- | include/rabbit.hrl | 8 | ||||
| -rw-r--r-- | include/rabbit_msg_store.hrl | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/include/gm_specs.hrl b/include/gm_specs.hrl index a317e63b68..b3dd661562 100644 --- a/include/gm_specs.hrl +++ b/include/gm_specs.hrl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is VMware, Inc. -%% Copyright (c) 2007-2012 VMware, Inc. All rights reserved. +%% Copyright (c) 2007-2013 VMware, Inc. All rights reserved. %% -ifdef(use_specs). diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 0ccb80bf02..eeee799ecf 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is VMware, Inc. -%% Copyright (c) 2007-2012 VMware, Inc. All rights reserved. +%% Copyright (c) 2007-2013 VMware, Inc. All rights reserved. %% -record(user, {username, @@ -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 @@ -89,9 +86,8 @@ %%---------------------------------------------------------------------------- --define(COPYRIGHT_MESSAGE, "Copyright (C) 2007-2012 VMware, Inc."). +-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 diff --git a/include/rabbit_msg_store.hrl b/include/rabbit_msg_store.hrl index f7c10bd8d9..8665dc5586 100644 --- a/include/rabbit_msg_store.hrl +++ b/include/rabbit_msg_store.hrl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is VMware, Inc. -%% Copyright (c) 2007-2012 VMware, Inc. All rights reserved. +%% Copyright (c) 2007-2013 VMware, Inc. All rights reserved. %% -include("rabbit.hrl"). |