diff options
author | Lars Thorsen <[email protected]> | 2018-08-24 10:04:58 +0200 |
---|---|---|
committer | Lars Thorsen <[email protected]> | 2018-08-24 10:04:58 +0200 |
commit | d35d59cea514582817f1fc450885d6a060e542c0 (patch) | |
tree | 86e440439b5dcb2bd8b7a6fb16fde2fc9471ea72 /lib/inets/src/inets_app/inets.appup.src | |
parent | 487f0c12e8700d31161a3bbb9c36e360aff484ac (diff) | |
parent | 53b1e77ea7be8d90d652521a2326046b5d95c3e2 (diff) | |
download | otp-d35d59cea514582817f1fc450885d6a060e542c0.tar.gz otp-d35d59cea514582817f1fc450885d6a060e542c0.tar.bz2 otp-d35d59cea514582817f1fc450885d6a060e542c0.zip |
Merge branch 'maint-21' into maint
* maint-21:
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 'lib/inets/src/inets_app/inets.appup.src')
-rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 0dcf66265e..b197590bfd 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,10 +18,12 @@ %% %CopyrightEnd% {"%VSN%", [ + {<<"7\\..*">>,[{restart_application, inets}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ], [ + {<<"7\\..*">>,[{restart_application, inets}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ] |