diff options
author | Ingela Anderton Andin <[email protected]> | 2017-03-21 15:03:17 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2017-03-21 15:03:17 +0100 |
commit | 746e7ac3262747204c2d26bac94d748c38c16076 (patch) | |
tree | 576aee6564ddff61099c01232b5c70e6913fef32 /lib/stdlib | |
parent | 11f07679d82bcb9d52b63b9b184fcca9d34123f8 (diff) | |
parent | 0c1ec0c1390c6c7f6d4dc66f1dbf1b7c6cc4994e (diff) | |
download | otp-746e7ac3262747204c2d26bac94d748c38c16076.tar.gz otp-746e7ac3262747204c2d26bac94d748c38c16076.tar.bz2 otp-746e7ac3262747204c2d26bac94d748c38c16076.zip |
Merge branch 'ingela/ssl/remove-deprecated'
* ingela/ssl/remove-deprecated:
ssl: Remove deprecated functions
Diffstat (limited to 'lib/stdlib')
-rw-r--r-- | lib/stdlib/src/otp_internal.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl index a1fde11c71..d89ff4a624 100644 --- a/lib/stdlib/src/otp_internal.erl +++ b/lib/stdlib/src/otp_internal.erl @@ -520,10 +520,9 @@ obsolete_1(erl_parse, get_attribute, 2) -> obsolete_1(erl_lint, modify_line, 2) -> {removed,{erl_parse,map_anno,2},"19.0"}; obsolete_1(ssl, negotiated_next_protocol, 1) -> - {deprecated,{ssl,negotiated_protocol,1}}; - + {removed,"removed in 20.0; use ssl:negotiated_protocol/1 instead"}; obsolete_1(ssl, connection_info, 1) -> - {deprecated, "deprecated; use connection_information/[1,2] instead"}; + {removed, "removed in 20.0; use ssl:connection_information/[1,2] instead"}; obsolete_1(httpd_conf, check_enum, 2) -> {deprecated, "deprecated; use lists:member/2 instead"}; |