diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-02-14 10:33:44 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-02-14 10:33:44 +0100 |
| commit | 37213d9ca054bb9ab3389de959cda58abedf9b06 (patch) | |
| tree | 027d7629669719cee9deb01eb0f258f298fc2ffe /lib/ssl/src/ssl.app.src | |
| parent | bbcf34d621d613046ea99eb5fafc01196c88e47f (diff) | |
| parent | 56354fdbf817291bed0c18373c5ad8dfb639b7e6 (diff) | |
| download | otp-37213d9ca054bb9ab3389de959cda58abedf9b06.tar.gz otp-37213d9ca054bb9ab3389de959cda58abedf9b06.tar.bz2 otp-37213d9ca054bb9ab3389de959cda58abedf9b06.zip | |
Merge branch 'ia/ssl/transport-cb-and-inet/OTP-10847'
* ia/ssl/transport-cb-and-inet/OTP-10847:
ssl: Generalize cb_info option
Diffstat (limited to 'lib/ssl/src/ssl.app.src')
| -rw-r--r-- | lib/ssl/src/ssl.app.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src index 13d5eaf4d7..897a097f73 100644 --- a/lib/ssl/src/ssl.app.src +++ b/lib/ssl/src/ssl.app.src @@ -13,10 +13,10 @@ ssl_session, ssl_session_cache_api, ssl_session_cache, + ssl_socket, ssl_record, ssl_manager, ssl_handshake, - ssl_debug, ssl_connection_sup, ssl_connection, ssl_cipher, |