summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2017-09-13 10:36:08 +0200
committerErlang/OTP <otp@erlang.org>2017-09-13 10:36:08 +0200
commit8dcef2e8dc2d743f9e8b056636ea2b936443f5c0 (patch)
treeefa60c177680f414e2c4a9e03c333a50c19b723a
parentc24f636d3326f75d7d6c4206e1888f2e5420cec1 (diff)
parentfcaa181fb1c2c24309f52636e18e78e83e2662fd (diff)
downloaderlang-8dcef2e8dc2d743f9e8b056636ea2b936443f5c0.tar.gz
Merge branch 'peterdmv/prepare_inets_release' into maint-20
* peterdmv/prepare_inets_release: inets: prepare for release
-rw-r--r--lib/inets/src/inets_app/inets.appup.src4
-rw-r--r--lib/inets/vsn.mk2
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index f9ad8709d9..a86413147c 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,14 +18,10 @@
%% %CopyrightEnd%
{"%VSN%",
[
- {<<"6.2.4">>, [{load_module, httpd_request_handler,
- soft_purge, soft_purge, []}]},
{<<"6\\..*">>,[{restart_application, inets}]},
{<<"5\\..*">>,[{restart_application, inets}]}
],
[
- {<<"6.2.4">>, [{load_module, httpd_request_handler,
- 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 96796f11c0..c4314f1ab5 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 6.4
+INETS_VSN = 6.4.1
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"