root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'stable'

This commit is contained in:
Michael Klishin 2017-04-02 22:04:24 +03:00
parent df0ea9a3b3 e16dcee191
commit e99a9faee0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/rabbitmq_trust_store/src/rabbit_trust_store.erl vendored
View File

@ -10,7 +10,7 @@
%% %%
%% The Original Code is RabbitMQ. %% The Original Code is RabbitMQ.
%% %%
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. %% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
%% %%
-module(rabbit_trust_store). -module(rabbit_trust_store).
@ -250,7 +250,7 @@ update_certs(CertsList, Provider, Config) ->
{ok, Cert, IssuerId} -> {ok, Cert, IssuerId} ->
save_cert(CertId, Provider, IssuerId, Cert, Name); save_cert(CertId, Provider, IssuerId, Cert, Name);
{error, Reason} -> {error, Reason} ->
rabbit_log:error("Unable to load CA sertificate ~p" rabbit_log:error("Unable to load CA certificate ~p"
" with provider ~p," " with provider ~p,"
" reason: ~p", " reason: ~p",
[CertId, Provider, Reason]) [CertId, Provider, Reason])

2
deps/rabbitmq_trust_store/src/rabbit_trust_store_app.erl vendored
View File

@ -10,7 +10,7 @@
%% %%
%% The Original Code is RabbitMQ. %% The Original Code is RabbitMQ.
%% %%
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. %% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
%% %%
-module(rabbit_trust_store_app). -module(rabbit_trust_store_app).

2
deps/rabbitmq_trust_store/src/rabbit_trust_store_sup.erl vendored
View File

@ -10,7 +10,7 @@
%% %%
%% The Original Code is RabbitMQ. %% The Original Code is RabbitMQ.
%% %%
%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. %% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved.
%% %%
-module(rabbit_trust_store_sup). -module(rabbit_trust_store_sup).