diff options
| author | Rickard Green <rickard@erlang.org> | 2020-10-02 17:24:16 +0200 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2020-10-02 17:24:16 +0200 |
| commit | 91c6646d8ff436e41410ffc27d940b915819548f (patch) | |
| tree | ddb921b6dec7424d8e57cdc9afef37e28899a5ed /lib/os_mon | |
| parent | 34f5ba4dd6e4187b420809f332eaafeec2ea7047 (diff) | |
| parent | 3f21ce1e6a5d6c548867fa4bc9a8c666c626ade1 (diff) | |
| download | erlang-91c6646d8ff436e41410ffc27d940b915819548f.tar.gz | |
Merge branch 'maint-23' into maint
* maint-23:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
Diffstat (limited to 'lib/os_mon')
| -rw-r--r-- | lib/os_mon/doc/src/notes.xml | 23 | ||||
| -rw-r--r-- | lib/os_mon/vsn.mk | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml index 4f42d97799..e4d544cca4 100644 --- a/lib/os_mon/doc/src/notes.xml +++ b/lib/os_mon/doc/src/notes.xml @@ -31,6 +31,29 @@ </header> <p>This document describes the changes made to the OS_Mon application.</p> +<section><title>Os_Mon 2.6.1</title> + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + The configuration parameter + <c>memsup_improved_system_memory_data</c> has been + introduced. It can be used to modify the result returned + by <c>memsup:get_system_memory_data()</c>. For more + information see the <c>memsup</c> documentation.</p> + <p> + Note that the configuration parameter is intended to be + removed in OTP 24 and the modified result is intended to + be used as of OTP 24.</p> + <p> + Own Id: OTP-16906 Aux Id: ERIERL-532 </p> + </item> + </list> + </section> + +</section> + <section><title>Os_Mon 2.6</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk index d1d84c10f1..b71478e75b 100644 --- a/lib/os_mon/vsn.mk +++ b/lib/os_mon/vsn.mk @@ -1 +1 @@ -OS_MON_VSN = 2.6 +OS_MON_VSN = 2.6.1 |