aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2014-02-25 16:07:07 +0100
committerHans Nilsson <[email protected]>2014-02-25 16:07:07 +0100
commitb73ad34005892d28574e6ddab15e19b537c26f6d (patch)
treec0e1361b4f5b3cdf5e6c52058184f1e3b8552cbe /lib/inets
parentb9440a0529bea5ccc3f4341db29ddda6f4b7c536 (diff)
parent5ba204b97bb101e67e5a65728db2f0a9097aa9bc (diff)
downloadotp-b73ad34005892d28574e6ddab15e19b537c26f6d.tar.gz
otp-b73ad34005892d28574e6ddab15e19b537c26f6d.tar.bz2
otp-b73ad34005892d28574e6ddab15e19b537c26f6d.zip
Merge branch 'rel-fixes'
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/src/inets_app/inets.appup.src10
-rw-r--r--lib/inets/vsn.mk1
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 7a909b2f3f..dd081962cc 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -16,6 +16,12 @@
%%
%% %CopyrightEnd%
{"%VSN%",
- [{<<"5\\..*">>,[{restart_application, inets}]}],
- [{<<"5\\..*">>,[{restart_application, inets}]}]
+ [
+ {"5.9.8", [{load_module, ftp, soft_purge, soft_purge, []}]},
+ {<<"5\\..*">>,[{restart_application, inets}]}
+ ],
+ [
+ {"5.9.8", [{load_module, ftp, soft_purge, soft_purge, []}]},
+ {<<"5\\..*">>,[{restart_application, inets}]}
+ ]
}.
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index cccfb7a44f..6b1f149cc8 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -21,4 +21,3 @@ APPLICATION = inets
INETS_VSN = 5.9.8
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
-