diff options
| author | Raimo Niskanen <[email protected]> | 2017-09-29 14:48:18 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2017-09-29 14:48:18 +0200 |
| commit | d0875a87fc59bea515294455b2047040118f3a7e (patch) | |
| tree | 2004f9733d6cc1a5d5ee6928902e8c30dda1a5c2 /lib/ssl/src/ssl.app.src | |
| parent | 5d718bac1d90ff38bd090c0c8bacdb75d0c88085 (diff) | |
| parent | cb1b585a710a3f5c724749ce267f55d3c1f85503 (diff) | |
| download | otp-d0875a87fc59bea515294455b2047040118f3a7e.tar.gz otp-d0875a87fc59bea515294455b2047040118f3a7e.tar.bz2 otp-d0875a87fc59bea515294455b2047040118f3a7e.zip | |
Merge branch 'raimo/ssl-dist-skip-loopback/OTP-14465'
* raimo/ssl-dist-skip-loopback/OTP-14465:
Update runtime dependencies
Disable debug function
Pass all info's to the ssl_connection state function
Remove ssl_tls_dist_ctrl module
Remove ssl_tls_dist_ctrl process
Remove ssl_tls_dist_proxy
Avoid dialyzer warning
Separate in and out in dist ctrl
Rewrite dist ctrl from port to process
Conflicts:
lib/ssl/src/ssl.app.src
Diffstat (limited to 'lib/ssl/src/ssl.app.src')
| -rw-r--r-- | lib/ssl/src/ssl.app.src | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src index 51407ef3b9..c5b55641a1 100644 --- a/lib/ssl/src/ssl.app.src +++ b/lib/ssl/src/ssl.app.src @@ -37,7 +37,6 @@ %% Erlang Distribution over SSL/TLS inet_tls_dist, inet6_tls_dist, - ssl_tls_dist_proxy, ssl_dist_sup, ssl_dist_connection_sup, ssl_dist_admin_sup, @@ -63,7 +62,5 @@ {applications, [crypto, public_key, kernel, stdlib]}, {env, []}, {mod, {ssl_app, []}}, - {runtime_dependencies, ["stdlib-3.2","public_key-1.5","kernel-3.0", - "erts-7.0","crypto-3.3", "inets-5.10.7"]}]}. - - + {runtime_dependencies, ["stdlib-3.2","public_key-1.5","kernel-6.0", + "erts-10.0","crypto-3.3", "inets-5.10.7"]}]}. |