diff options
| author | Zandra Hird <[email protected]> | 2015-03-19 10:36:00 +0100 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-03-19 10:36:17 +0100 |
| commit | 2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce (patch) | |
| tree | c66710aa5e4dc7c7ac86c40cd49b6d3d47046930 /lib/stdlib | |
| parent | 8f7756db0c1eec733e24d9fadef7c855981c6dc1 (diff) | |
| parent | 7cf85926c11d38ce5ebd181f9f98185f359d64a3 (diff) | |
| download | otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.tar.gz otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.tar.bz2 otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.zip | |
Merge branch 'essen/ssl-alpn'
* essen/ssl-alpn:
ssl: Add TLS-ALPN support
OTP-12580
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/src/otp_internal.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl index 4a338798d0..d6afa5e09b 100644 --- a/lib/stdlib/src/otp_internal.erl +++ b/lib/stdlib/src/otp_internal.erl @@ -590,6 +590,8 @@ obsolete_1(core_lib, is_literal_list, 1) -> " instead"}; obsolete_1(core_lib, literal_value, 1) -> {deprecated,{core_lib,concrete,1}}; +obsolete_1(ssl, negotiated_next_protocol, 1) -> + {deprecated,{ssl,negotiated_protocol}}; obsolete_1(_, _, _) -> no. |