aboutsummaryrefslogtreecommitdiffstats
path: root/lib/os_mon
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2013-12-09 20:12:33 +0100
committerErlang/OTP <[email protected]>2013-12-09 20:12:33 +0100
commit25237481ccccd3ddfa74582dc267632ad618ba30 (patch)
tree5a70ff65dd58d7315971476921837f3e43a572f6 /lib/os_mon
parentba05ec6dcbf26df15351eae0dc2055c9628b9706 (diff)
downloadotp-25237481ccccd3ddfa74582dc267632ad618ba30.tar.gz
otp-25237481ccccd3ddfa74582dc267632ad618ba30.tar.bz2
otp-25237481ccccd3ddfa74582dc267632ad618ba30.zip
Prepare releaseOTP_R16B03
Diffstat (limited to 'lib/os_mon')
-rw-r--r--lib/os_mon/doc/src/notes.xml16
-rw-r--r--lib/os_mon/vsn.mk2
2 files changed, 17 insertions, 1 deletions
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
index 6d520c7acb..db386979c0 100644
--- a/lib/os_mon/doc/src/notes.xml
+++ b/lib/os_mon/doc/src/notes.xml
@@ -30,6 +30,22 @@
</header>
<p>This document describes the changes made to the OS_Mon application.</p>
+<section><title>Os_Mon 2.2.14</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix incorrect reporting of memory on OS X via memsup.
+ Thanks to Christopher Meiklejohn.</p>
+ <p>
+ Own Id: OTP-11454</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Os_Mon 2.2.13</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk
index 0af587b9ae..e9e90729f2 100644
--- a/lib/os_mon/vsn.mk
+++ b/lib/os_mon/vsn.mk
@@ -1 +1 @@
-OS_MON_VSN = 2.2.13
+OS_MON_VSN = 2.2.14