diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-04-05 15:54:34 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-04-05 15:54:34 +0300 |
| commit | 522a83caaba58d2094c421d5c00b0fc2bb09ce8b (patch) | |
| tree | 103c884f282574c2b7dd32be7c071b28d9d277eb | |
| parent | 0b73c1d3a548b48e62208fcafed8a1cc7240cca5 (diff) | |
| parent | beac7417153408cbbfa957d6b1ad0ca85dd948a7 (diff) | |
| download | rabbitmq-server-git-522a83caaba58d2094c421d5c00b0fc2bb09ce8b.tar.gz | |
Merge branch 'master' into rabbitmq-server-1143
| -rw-r--r-- | include/gm_specs.hrl | 2 | ||||
| -rw-r--r-- | include/rabbit_cli.hrl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/gm_specs.hrl b/include/gm_specs.hrl index d03f9938e5..c4f584e87d 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 Pivotal Software, Inc. -%% Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. %% -type callback_result() :: 'ok' | {'stop', any()} | {'become', atom(), args()}. diff --git a/include/rabbit_cli.hrl b/include/rabbit_cli.hrl index 53be9fcda0..12fa5b4dd8 100644 --- a/include/rabbit_cli.hrl +++ b/include/rabbit_cli.hrl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is Pivotal Software, Inc. -%% Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. %% -define(NODE_OPT, "-n"). |