diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-04-05 15:45:19 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-04-05 15:45:19 +0300 |
| commit | 0b73c1d3a548b48e62208fcafed8a1cc7240cca5 (patch) | |
| tree | 8e52d71610ec3a326b3344bee2b01b17282c62cb /src | |
| parent | 32e4955c5a6cdd829795c69e1fbfff9901eeb01e (diff) | |
| parent | e61b424a0345eb4c9cd0bc815193f7f93528814d (diff) | |
| download | rabbitmq-server-git-0b73c1d3a548b48e62208fcafed8a1cc7240cca5.tar.gz | |
Merge branch 'master' into rabbitmq-server-1143
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_connection_tracking.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_connection_tracking_handler.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_peer_discovery.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_peer_discovery_classic_config.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_peer_discovery_dns.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_policy_merge_strategy.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_vhost_limit.erl | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit_connection_tracking.erl b/src/rabbit_connection_tracking.erl index 40f1d1f71d..f8c4c6541b 100644 --- a/src/rabbit_connection_tracking.erl +++ b/src/rabbit_connection_tracking.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_connection_tracking). diff --git a/src/rabbit_connection_tracking_handler.erl b/src/rabbit_connection_tracking_handler.erl index 739b8049c0..f1b844c60c 100644 --- a/src/rabbit_connection_tracking_handler.erl +++ b/src/rabbit_connection_tracking_handler.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_connection_tracking_handler). diff --git a/src/rabbit_peer_discovery.erl b/src/rabbit_peer_discovery.erl index 2b6701210a..98d2f9e7c5 100644 --- a/src/rabbit_peer_discovery.erl +++ b/src/rabbit_peer_discovery.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is Pivotal Software, Inc. -%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_peer_discovery). diff --git a/src/rabbit_peer_discovery_classic_config.erl b/src/rabbit_peer_discovery_classic_config.erl index d27997240a..685e4b1639 100644 --- a/src/rabbit_peer_discovery_classic_config.erl +++ b/src/rabbit_peer_discovery_classic_config.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_peer_discovery_classic_config). diff --git a/src/rabbit_peer_discovery_dns.erl b/src/rabbit_peer_discovery_dns.erl index 6082f823b6..5bc85d340d 100644 --- a/src/rabbit_peer_discovery_dns.erl +++ b/src/rabbit_peer_discovery_dns.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_peer_discovery_dns). diff --git a/src/rabbit_policy_merge_strategy.erl b/src/rabbit_policy_merge_strategy.erl index 55ad87ccac..3c6c6f07ee 100644 --- a/src/rabbit_policy_merge_strategy.erl +++ b/src/rabbit_policy_merge_strategy.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_policy_merge_strategy). diff --git a/src/rabbit_vhost_limit.erl b/src/rabbit_vhost_limit.erl index d0c775f0bd..58c0ce065f 100644 --- a/src/rabbit_vhost_limit.erl +++ b/src/rabbit_vhost_limit.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. %% -module(rabbit_vhost_limit). |