diff options
author | Ingela Anderton Andin <[email protected]> | 2011-10-06 11:53:52 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2011-10-06 11:53:52 +0200 |
commit | 00202339445daae6ed931f28f932089d5c3dd455 (patch) | |
tree | c08c4bb7b615ccb1b3325ce7ad65179a5f15be2a /lib/ssl/src/ssl_broker_sup.erl | |
parent | 811e0de29d02031acb0771e1fa74d8f4f97574a6 (diff) | |
parent | 64a3651b3ece1a1e3195f20e37247f929d179f61 (diff) | |
download | otp-00202339445daae6ed931f28f932089d5c3dd455.tar.gz otp-00202339445daae6ed931f28f932089d5c3dd455.tar.bz2 otp-00202339445daae6ed931f28f932089d5c3dd455.zip |
Merge branch 'ia/ssl/remove-old-ssl/OTP-7048'
* ia/ssl/remove-old-ssl/OTP-7048:
Remove old ssl implementation and deprecated function ssl:peercert/1
Conflicts:
lib/ssl/test/Makefile
Diffstat (limited to 'lib/ssl/src/ssl_broker_sup.erl')
-rw-r--r-- | lib/ssl/src/ssl_broker_sup.erl | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/lib/ssl/src/ssl_broker_sup.erl b/lib/ssl/src/ssl_broker_sup.erl deleted file mode 100644 index 6d56a5fcf6..0000000000 --- a/lib/ssl/src/ssl_broker_sup.erl +++ /dev/null @@ -1,46 +0,0 @@ -%% -%% %CopyrightBegin% -%% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. -%% -%% The contents of this file are subject to the Erlang Public License, -%% Version 1.1, (the "License"); you may not use this file except in -%% compliance with the License. You should have received a copy of the -%% Erlang Public License along with this software. If not, it can be -%% retrieved online at http://www.erlang.org/. -%% -%% Software distributed under the License is distributed on an "AS IS" -%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -%% the License for the specific language governing rights and limitations -%% under the License. -%% -%% %CopyrightEnd% -%% - -%% - -%%% Purpose : Supervisor for brokers - --module(ssl_broker_sup). - --behaviour(supervisor). - --export([start_link/0]). - -%% supervisor callbacks --export([init/1]). - -start_link() -> - supervisor:start_link({local, ssl_broker_sup}, ssl_broker_sup, - []). - -init([]) -> - {ok, {{simple_one_for_one, 10, 3600}, - [{ssl_broker, - {ssl_broker, start_link, []}, - temporary, - 100, - worker, - [ssl_broker]} - ]}}. - |