diff options
| author | Lars Thorsen <[email protected]> | 2018-08-24 10:08:27 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2018-08-24 10:08:27 +0200 |
| commit | 35979da59dd3c88601ed73a5eeb9054bbd28b5a1 (patch) | |
| tree | ce609632d3e5cae8714f47a7cb2d30aa705aeee1 /erts/emulator/Makefile | |
| parent | 2ce155ca0de6890cd5750d97a6593d67d4d940f7 (diff) | |
| parent | d35d59cea514582817f1fc450885d6a060e542c0 (diff) | |
| download | otp-35979da59dd3c88601ed73a5eeb9054bbd28b5a1.tar.gz otp-35979da59dd3c88601ed73a5eeb9054bbd28b5a1.tar.bz2 otp-35979da59dd3c88601ed73a5eeb9054bbd28b5a1.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Updated the engine load functionality
inets: Prepare for release
inets: Use status code 501 when no mod_* handles the request
ssl: Prepare for release
ssl: Make sure that a correct cipher suite is selected
ssl: Make sure that a correct cipher suite is selected
Diffstat (limited to 'erts/emulator/Makefile')
0 files changed, 0 insertions, 0 deletions