aboutsummaryrefslogtreecommitdiffstats
path: root/lib/os_mon
diff options
context:
space:
mode:
authorMagnus Lidén <[email protected]>2013-12-10 14:31:40 +0100
committerMagnus Lidén <[email protected]>2013-12-10 14:31:40 +0100
commit458e302f61e2de36ebd49c5a5a5b984224bdce94 (patch)
tree0eaff569e08f2cd170275fb38eff8e56993ae47d /lib/os_mon
parent6d22d78204ca8bc8ed4beb92f6021ff3ba93a882 (diff)
parent25237481ccccd3ddfa74582dc267632ad618ba30 (diff)
downloadotp-458e302f61e2de36ebd49c5a5a5b984224bdce94.tar.gz
otp-458e302f61e2de36ebd49c5a5a5b984224bdce94.tar.bz2
otp-458e302f61e2de36ebd49c5a5a5b984224bdce94.zip
Merge tag 'OTP_R16B03'
The R16B03 release Conflicts: lib/sasl/vsn.mk
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 c6b5bc8895..3a7d7793d4 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