diff options
| author | Erlang/OTP <[email protected]> | 2015-07-01 15:54:12 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-07-01 15:54:12 +0200 |
| commit | fb794658ae54b304219c907648f230decf10d622 (patch) | |
| tree | 1c6a10b4f956b70a6d3db9540be0fe9f055d5e05 /lib/inets/src/inets_app/inets.appup.src | |
| parent | 0f3f8f5871a1ea503cc80ae17adc8dec96c79445 (diff) | |
| parent | 77d6dfd57e87daf7d0f2a02f7c592574241ad2d2 (diff) | |
| download | otp-fb794658ae54b304219c907648f230decf10d622.tar.gz otp-fb794658ae54b304219c907648f230decf10d622.tar.bz2 otp-fb794658ae54b304219c907648f230decf10d622.zip | |
Merge branch 'ia/inets/maint-15/fd/OTP-12874' into maint-r15
* ia/inets/maint-15/fd/OTP-12874:
ssl: Fix appup
inets: Prepare for release
inets: Fix broken fd feature
Diffstat (limited to 'lib/inets/src/inets_app/inets.appup.src')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index d2475a0e48..da8791bff0 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -1,7 +1,7 @@ %% This is an -*- erlang -*- file. %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2014. All Rights Reserved. +%% Copyright Ericsson AB 1999-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -18,8 +18,8 @@ {"%VSN%", [ - {<<"5\\.*">>, [{restart_application, inets}]} + {<<"5\\..*">>, [{restart_application, inets}]} ], [ - {<<"5\\.*">>, [{restart_application, inets}]} + {<<"5\\..*">>, [{restart_application, inets}]} ]}. |