aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-09-07 09:43:45 +0200
committerIngela Anderton Andin <[email protected]>2016-09-07 09:43:45 +0200
commitf652cf0ee30854d23026ff5886385f0df6a5c7c8 (patch)
tree8c605897f039e298ed7146777f75cd2926bbea2c /lib/inets
parentd6528b8538a64659b1836806ba946877d5aed129 (diff)
parent61b1abd20322ad4f05eab7d53c333c6a1e91c296 (diff)
downloadotp-f652cf0ee30854d23026ff5886385f0df6a5c7c8.tar.gz
otp-f652cf0ee30854d23026ff5886385f0df6a5c7c8.tar.bz2
otp-f652cf0ee30854d23026ff5886385f0df6a5c7c8.zip
Merge branch 'maint'
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/src/inets_app/inets.appup.src6
-rw-r--r--lib/inets/vsn.mk2
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index d4d21f6774..3a31daeb20 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,16 +18,10 @@
%% %CopyrightEnd%
{"%VSN%",
[
- {<<"6.3.1">>,
- [{load_module, mod_esi, soft_purge, soft_purge, []}
- ]},
{<<"6\\..*">>,[{restart_application, inets}]},
{<<"5\\..*">>,[{restart_application, inets}]}
],
[
- {<<"6.3.1">>,
- [{load_module, mod_esi, soft_purge, soft_purge, []}
- ]},
{<<"6\\..*">>,[{restart_application, inets}]},
{<<"5\\..*">>,[{restart_application, inets}]}
]
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 747724a86b..f668ef106c 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 6.3.2
+INETS_VSN = 6.3.3
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"