aboutsummaryrefslogtreecommitdiffstats
path: root/lib/os_mon
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-10-04 17:58:42 +0200
committerBjörn-Egil Dahlberg <[email protected]>2011-10-04 17:58:42 +0200
commitd01551f400e2a7944dcc10319be0c9f248ca3179 (patch)
tree628939585bd2fc87a3c4d985474bcb7d3e3cc452 /lib/os_mon
parentea34e624a30da0312cbea8b64d1484a46bb43656 (diff)
parentb6dc1a844eab061d0a7153d46e7e68296f15a504 (diff)
downloadotp-d01551f400e2a7944dcc10319be0c9f248ca3179.tar.gz
otp-d01551f400e2a7944dcc10319be0c9f248ca3179.tar.bz2
otp-d01551f400e2a7944dcc10319be0c9f248ca3179.zip
Merge branch 'dev' into major
Diffstat (limited to 'lib/os_mon')
-rw-r--r--lib/os_mon/doc/src/notes.xml14
-rw-r--r--lib/os_mon/vsn.mk2
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
index 0a088ca8b6..f641bbd828 100644
--- a/lib/os_mon/doc/src/notes.xml
+++ b/lib/os_mon/doc/src/notes.xml
@@ -30,6 +30,20 @@
</header>
<p>This document describes the changes made to the OS_Mon application.</p>
+<section><title>Os_Mon 2.2.7</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>Remove misc. compiler warnings</p>
+ <p>
+ Own Id: OTP-9542</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Os_Mon 2.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 2d583a398b..f000e24a8f 100644
--- a/lib/os_mon/vsn.mk
+++ b/lib/os_mon/vsn.mk
@@ -1 +1 @@
-OS_MON_VSN = 2.2.6
+OS_MON_VSN = 2.2.7