diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-12-02 09:37:36 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-12-02 09:37:36 +0100 |
| commit | 826b9ae8b655f18fc2a74f2c9147fb4163a78770 (patch) | |
| tree | 12b276f0f28db3dbea19d884ada8ef2e7b81a077 /lib/inets | |
| parent | d0dc399c5e40980847e462a6c1bc375d02a3a9ca (diff) | |
| parent | 62ed44035a05091ab4b3438738e717140d115234 (diff) | |
| download | otp-826b9ae8b655f18fc2a74f2c9147fb4163a78770.tar.gz otp-826b9ae8b655f18fc2a74f2c9147fb4163a78770.tar.bz2 otp-826b9ae8b655f18fc2a74f2c9147fb4163a78770.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 35 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
2 files changed, 1 insertions, 36 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 4bc49e1e67..90524ac367 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -17,44 +17,9 @@ %% %CopyrightEnd% {"%VSN%", [ - {"5.10.2", - [ - {load_module, httpd_request_handler, soft_purge, soft_purge, - []}]}, - {"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, 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\\..*">>,[{restart_application, inets}]} ], [ - {"5.10.2", - [ - {load_module, httpd_request_handler, soft_purge, soft_purge, - []}]}, - {"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, 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\\..*">>,[{restart_application, inets}]} ] }. diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index 029f6ac4d2..dbae5e4b3c 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -18,6 +18,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 5.10.3 +INETS_VSN = 5.10.4 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" |