diff options
| author | Rickard Green <[email protected]> | 2017-03-14 16:21:00 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-03-14 16:21:00 +0100 |
| commit | 27df945c35aa541330700d75b6844de9886361b2 (patch) | |
| tree | 7fd93336232d2e8f17612ffcf114d9d7e1038fe9 /lib/os_mon | |
| parent | aec64f75c5a2a044b9e5cec77fb2ca243ff1b212 (diff) | |
| parent | a748cafdc7063d9f181ba12088db6458793ced2f (diff) | |
| download | otp-27df945c35aa541330700d75b6844de9886361b2.tar.gz otp-27df945c35aa541330700d75b6844de9886361b2.tar.bz2 otp-27df945c35aa541330700d75b6844de9886361b2.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Conflicts:
OTP_VERSION
lib/typer/doc/src/notes.xml
lib/typer/vsn.mk
Diffstat (limited to 'lib/os_mon')
| -rw-r--r-- | lib/os_mon/doc/src/notes.xml | 15 | ||||
| -rw-r--r-- | lib/os_mon/vsn.mk | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml index e6e80b046d..df4151147c 100644 --- a/lib/os_mon/doc/src/notes.xml +++ b/lib/os_mon/doc/src/notes.xml @@ -31,6 +31,21 @@ </header> <p>This document describes the changes made to the OS_Mon application.</p> +<section><title>Os_Mon 2.4.2</title> + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + Support s390x in os_mon.</p> + <p> + Own Id: OTP-14161 Aux Id: PR-1309 </p> + </item> + </list> + </section> + +</section> + <section><title>Os_Mon 2.4.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk index 1ac0fb1d27..59a3d9dee4 100644 --- a/lib/os_mon/vsn.mk +++ b/lib/os_mon/vsn.mk @@ -1 +1 @@ -OS_MON_VSN = 2.4.1 +OS_MON_VSN = 2.4.2 |