Merge branch 'bmk/snmp/manager/log_to_io/OTP-10066' into bmk/snmp/snmp4221_integration

4 files changed, 61 insertions, 2 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 2d045faa0f..84a249020a 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,6 +34,55 @@
 
 
   <section>
+    <title>SNMP Development Toolkit 4.22.1</title>
+    <p>Version 4.22.1 supports code replacement in runtime from/to
+    version 4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 
+    4.21. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[agent] Improve error handling while reading agent config files. 
+	  Some files contain mandatory information and is therefor themself
+	  mandatory. </p>
+	  <p>Own Id: OTP-9943</p>
+        </item>
+      </list>
+-->
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[manager] 
+	  <seealso marker="snmpm#log_to_io">snmpm:log_to_io/6</seealso> 
+	  did not use the LogName argument. </p>
+          <p>Own Id: OTP-10066</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+
+  </section> <!-- 4.22.1 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.22</title>
     <p>Version 4.22 supports code replacement in runtime from/to
     version 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 4.21. </p>
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 8360d88c94..f34aeddbb9 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,6 +22,11 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.22", 
+   [
+    {load_module, snmpm, soft_purge, soft_purge, []} 
+   ]
+  }, 
   {"4.21.7", 
    [
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
@@ -288,6 +293,11 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.22", 
+   [
+    {load_module, snmpm, soft_purge, soft_purge, []} 
+   ]
+  }, 
   {"4.21.7", 
    [
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
diff --git a/lib/snmp/src/manager/snmpm.erl b/lib/snmp/src/manager/snmpm.erl
index 89eaee9f80..f590892c66 100644
--- a/lib/snmp/src/manager/snmpm.erl
+++ b/lib/snmp/src/manager/snmpm.erl
@@ -1411,7 +1411,7 @@ log_to_io(LogDir, Mibs, LogName, LogFile) ->
 log_to_io(LogDir, Mibs, LogName, LogFile, Start) -> 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Start).
 log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> 
-    snmp:log_to_io(LogDir, Mibs, LogFile, Start, Stop).
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop).
     
 
 change_log_size(NewSize) ->
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 36b9764bc8..b90dbe4eef 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 4.22
+SNMP_VSN    = 4.22.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"