diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-06-18 08:46:27 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-06-18 08:46:27 +0200 |
| commit | bc9085f3eb033a99d128cba9403a63c9b3d51644 (patch) | |
| tree | 2a79768c78ac1e86b17fbd389588597002edd34f /lib | |
| parent | 805f9c89fc01220bc1bb0f27e1b68fd4eca688ba (diff) | |
| parent | 608b77fa435c10966d37efedfe1e3b6d7e442c50 (diff) | |
| download | otp-bc9085f3eb033a99d128cba9403a63c9b3d51644.tar.gz otp-bc9085f3eb033a99d128cba9403a63c9b3d51644.tar.bz2 otp-bc9085f3eb033a99d128cba9403a63c9b3d51644.zip | |
Merge branch 'ia/inets/prep-for-release' into maint
* ia/inets/prep-for-release:
inets: Prepare for release
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 20 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
2 files changed, 19 insertions, 3 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 5499596bbd..6991fb6d04 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -17,8 +17,16 @@ %% %CopyrightEnd% {"%VSN%", [ + {"5.10.1", + [{load_module, httpc_handler, soft_purge, soft_purge, []}, + {load_module, httpd, soft_purge, soft_purge, []}, + {load_module, httpd_manager, soft_purge, soft_purge, []}, + {load_module, httpd_request, soft_purge, soft_purge, []}, + {load_module, httpd_request_handler, soft_purge, soft_purge, + []}]}, {"5.10", - [{load_module, httpd, soft_purge, soft_purge, []}, + [{load_module, httpc_handler, soft_purge, soft_purge, []}, + {load_module, httpd, soft_purge, soft_purge, []}, {load_module, httpd_manager, soft_purge, soft_purge, []}, {load_module, httpd_request, soft_purge, soft_purge, []}, {load_module, httpd_request_handler, soft_purge, soft_purge, @@ -26,8 +34,16 @@ {<<"5\\..*">>,[{restart_application, inets}]} ], [ + {"5.10.1", + [{load_module, httpc_handler, soft_purge, soft_purge, []}, + {load_module, httpd, soft_purge, soft_purge, []}, + {load_module, httpd_manager, soft_purge, soft_purge, []}, + {load_module, httpd_request, soft_purge, soft_purge, []}, + {load_module, httpd_request_handler, soft_purge, soft_purge, + []}]}, {"5.10", - [{load_module, httpd, soft_purge, soft_purge, []}, + [{load_module, httpc_handler, soft_purge, soft_purge, []}, + {load_module, httpd, soft_purge, soft_purge, []}, {load_module, httpd_manager, soft_purge, soft_purge, []}, {load_module, httpd_request, soft_purge, soft_purge, []}, {load_module, httpd_request_handler, soft_purge, soft_purge, []}]}, diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index bbd86c3eb3..79081f371c 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -18,6 +18,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 5.10.1 +INETS_VSN = 5.10.2 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" |