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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | lib/ssl/src/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile index 2e7df9792e..8eba5cf347 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1999-2016. All Rights Reserved. +# Copyright Ericsson AB 1999-2017. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -87,8 +87,7 @@ MODULES= \ ssl_v2 \ ssl_v3 \ tls_v1 \ - dtls_v1 \ - ssl_tls_dist_proxy + dtls_v1 INTERNAL_HRL_FILES = \ ssl_alert.hrl ssl_cipher.hrl \ |