Skip to content

Commit 48182de

Browse files
michaelklishinmichaelklishin
committed
Merge branch 'stable' into more-info-during-shutdown
2 parents 78617ab + 7741b37 commit 48182de

File tree

113 files changed

+114
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+114
-114
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion

‎src/background_gc.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(background_gc).

‎src/dtree.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
%% A dual-index tree.

‎src/file_handle_cache.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(file_handle_cache).

‎src/file_handle_cache_stats.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(file_handle_cache_stats).

‎src/gatherer.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(gatherer).

‎src/gm.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(gm).

‎src/mnesia_sync.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(mnesia_sync).

‎src/rabbit.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit).

‎src/rabbit_access_control.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_access_control).

‎src/rabbit_alarm.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616
%% There are two types of alarms handled by this module:
1717
%%

‎src/rabbit_amqqueue_process.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_amqqueue_process).

‎src/rabbit_amqqueue_sup.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_amqqueue_sup).

‎src/rabbit_amqqueue_sup_sup.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_amqqueue_sup_sup).

‎src/rabbit_auth_mechanism_amqplain.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_auth_mechanism_amqplain).

‎src/rabbit_auth_mechanism_cr_demo.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_auth_mechanism_cr_demo).

‎src/rabbit_auth_mechanism_plain.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_auth_mechanism_plain).

‎src/rabbit_autoheal.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_autoheal).

‎src/rabbit_binding.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_binding).

‎src/rabbit_channel_sup.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_channel_sup).

‎src/rabbit_channel_sup_sup.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_channel_sup_sup).

‎src/rabbit_cli.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_cli).

‎src/rabbit_client_sup.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_client_sup).

‎src/rabbit_connection_helper_sup.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_connection_helper_sup).

‎src/rabbit_connection_sup.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_connection_sup).

‎src/rabbit_control_main.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_control_main).

‎src/rabbit_control_pbe.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_control_pbe).

‎src/rabbit_credential_validation.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_credential_validation).

‎src/rabbit_credential_validator.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_credential_validator).

‎src/rabbit_credential_validator_accept_everything.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_credential_validator_accept_everything).

‎src/rabbit_credential_validator_min_password_length.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_credential_validator_min_password_length).

‎src/rabbit_credential_validator_password_regexp.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717

‎src/rabbit_dead_letter.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_dead_letter).

‎src/rabbit_diagnostics.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_diagnostics).

‎src/rabbit_direct.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_direct).

‎src/rabbit_disk_monitor.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_disk_monitor).

‎src/rabbit_epmd_monitor.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_epmd_monitor).
@@ -92,6 +92,6 @@ check_epmd(#state{mod = Mod,
9292
"epmd does not know us, re-registering ~s at port ~b~n",
9393
[Me, Port]),
9494
rabbit_nodes:ensure_epmd(),
95-
erl_epmd:register_node(Me, Port);
95+
Mod:register_node(Me, Port);
9696
_ -> ok
9797
end.

‎src/rabbit_error_logger.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_error_logger).

‎src/rabbit_error_logger_file_h.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_error_logger_file_h).

‎src/rabbit_exchange.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_exchange).

‎src/rabbit_exchange_parameters.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_exchange_parameters).

‎src/rabbit_exchange_type_direct.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_exchange_type_direct).

‎src/rabbit_exchange_type_fanout.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
%% The Original Code is RabbitMQ.
1212
%%
1313
%% The Initial Developer of the Original Code is GoPivotal, Inc.
14-
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved.
14+
%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
1515
%%
1616

1717
-module(rabbit_exchange_type_fanout).

0 commit comments

Comments
 (0)