diff options
| -rw-r--r-- | lib/inets/doc/src/notes.xml | 34 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 10 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.erl | 5 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
4 files changed, 48 insertions, 3 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 489e88cbe5..687e127d0b 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -32,6 +32,40 @@ <file>notes.xml</file> </header> + <section><title>Inets 5.2.0.1</title> + + <section><title>Improvements and New Features</title> + <p>-</p> +<!-- + <list> + <item> + <p>The documentation is now built with open source tools + (<em>xsltproc</em> and <em>fop</em>) that exists on most + platforms. One visible change is that the frames are removed.</p> + <p>Own Id: OTP-8249</p> + </item> + + </list> +--> + </section> + + <section><title>Fixed Bugs and Malfunctions</title> + +<!-- + <p>-</p> +--> + + <list> + <item> + <p>Fixing minor Dialyzer and copyright problem.</p> + </item> + + </list> + </section> + + </section> <!-- 5.2.0.1 --> + + <section><title>Inets 5.2</title> <section><title>Improvements and New Features</title> diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 59ee1ba03d..0112a64239 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,6 +18,11 @@ {"%VSN%", [ + {"5.2", + [ + {load_module, inets, soft_purge, soft_purge, []} + ] + }, {"5.1.3", [ {load_module, httpd_response, soft_purge, soft_purge, []}, @@ -33,6 +38,11 @@ } ], [ + {"5.2", + [ + {load_module, inets, soft_purge, soft_purge, []} + ] + }, {"5.1.3", [ {load_module, httpd_response, soft_purge, soft_purge, []}, diff --git a/lib/inets/src/inets_app/inets.erl b/lib/inets/src/inets_app/inets.erl index 7977a3dc2a..77cb14cc20 100644 --- a/lib/inets/src/inets_app/inets.erl +++ b/lib/inets/src/inets_app/inets.erl @@ -87,6 +87,7 @@ start(Service, ServiceConfig, How) -> Module = service_module(Service), start_service(Module, ServiceConfig, How). + %%-------------------------------------------------------------------- %% Function: stop() -> ok %% @@ -579,8 +580,8 @@ handle_trace({trace_ts, _Who, call, {?MODULE, report_event, [_Sev, "stop trace", stop_trace, [stop_trace]]}, Timestamp}, - {standard_io, _} = Fd) -> - (catch io:format(Fd, "stop trace at ~s~n", [format_timestamp(Timestamp)])), + {_, standard_io} = Fd) -> + (catch io:format(standard_io, "stop trace at ~s~n", [format_timestamp(Timestamp)])), Fd; handle_trace({trace_ts, _Who, call, {?MODULE, report_event, diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index f80524e7e7..8ed4f0c192 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -17,7 +17,7 @@ # # %CopyrightEnd% -INETS_VSN = 5.2 +INETS_VSN = 5.2.0.1 PRE_VSN = APP_VSN = "inets-$(INETS_VSN)$(PRE_VSN)" |