diff options
author | Björn-Egil Dahlberg <[email protected]> | 2011-05-24 12:27:49 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2011-05-24 12:27:49 +0200 |
commit | 102f7fd76efa911bf4c2cdbe5fffa3363a5f7074 (patch) | |
tree | 8aeb43135555f28d880915e1abae07e8f2b644d0 /lib/ssl/src/ssl.erl | |
parent | 0b0d240d03c6c65e5f23dbd55ef0fa8ca17d4644 (diff) | |
parent | aab1e1d1290b827b09287cadfa5fbb40c916b437 (diff) | |
download | otp-102f7fd76efa911bf4c2cdbe5fffa3363a5f7074.tar.gz otp-102f7fd76efa911bf4c2cdbe5fffa3363a5f7074.tar.bz2 otp-102f7fd76efa911bf4c2cdbe5fffa3363a5f7074.zip |
Merge branch 'ia/ssl/ets-table-cleanup' into dev
* ia/ssl/ets-table-cleanup:
Corrected last argument to timer:apply_after also corrected a dilyzer spec
Diffstat (limited to 'lib/ssl/src/ssl.erl')
-rw-r--r-- | lib/ssl/src/ssl.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 0ced6707eb..a5e8e7e5c2 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -415,7 +415,7 @@ getopts(#sslsocket{} = Socket, Options) -> ssl_broker:getopts(Socket, Options). %%-------------------------------------------------------------------- --spec setopts(#sslsocket{}, [proplist:property()]) -> ok | {error, reason()}. +-spec setopts(#sslsocket{}, [proplists:property()]) -> ok | {error, reason()}. %% %% Description: Sets options %%-------------------------------------------------------------------- |