aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/src/sasl.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2016-02-25 15:35:54 +0100
committerSiri Hansen <[email protected]>2016-02-25 15:35:54 +0100
commit023f096db6c225499b7af0fdea984a078bd660f9 (patch)
tree94bdc633e7ed6d119367f499c61dd628ac9cfdaf /lib/sasl/src/sasl.erl
parent95811d8f832076c329166fb529394ca015266ea2 (diff)
parentc56cdb91d057cdb40bb79d4f49e88966c0244017 (diff)
downloadotp-023f096db6c225499b7af0fdea984a078bd660f9.tar.gz
otp-023f096db6c225499b7af0fdea984a078bd660f9.tar.bz2
otp-023f096db6c225499b7af0fdea984a078bd660f9.zip
Merge branch 'siri/remove-overload/OTP-13184'
* siri/remove-overload/OTP-13184: Remove module 'overload' from SASL
Diffstat (limited to 'lib/sasl/src/sasl.erl')
-rw-r--r--lib/sasl/src/sasl.erl5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl
index fc49fc2465..0fb85682c6 100644
--- a/lib/sasl/src/sasl.erl
+++ b/lib/sasl/src/sasl.erl
@@ -170,7 +170,4 @@ init(safe) ->
AlarmH = {alarm_handler,
{alarm_handler, start_link, []},
permanent, 2000, worker, dynamic},
- Overload = {overload,
- {overload, start_link, []},
- permanent, 2000, worker, [overload]},
- {ok, {SupFlags, [AlarmH, Overload]}}.
+ {ok, {SupFlags, [AlarmH]}}.