aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-08-01 11:34:32 +0200
committerMicael Karlberg <[email protected]>2012-08-01 11:34:32 +0200
commit740b2bac736a9472c9e87fe0ac9e574467f1c35e (patch)
tree7870a0e3f91953a1ed492d33296ed9e28820f6ba /lib/snmp/src
parent9f6993fb41a8d14111325779c14968556b4f7f83 (diff)
parent2df3ddfbc2cd99c21b8a125858ab0090a318295e (diff)
downloadotp-740b2bac736a9472c9e87fe0ac9e574467f1c35e.tar.gz
otp-740b2bac736a9472c9e87fe0ac9e574467f1c35e.tar.bz2
otp-740b2bac736a9472c9e87fe0ac9e574467f1c35e.zip
Merge branch 'bmk/snmp/manager/log_to_io/OTP-10066' into bmk/snmp/snmp4221_integration
Diffstat (limited to 'lib/snmp/src')
-rw-r--r--lib/snmp/src/app/snmp.appup.src10
-rw-r--r--lib/snmp/src/manager/snmpm.erl2
2 files changed, 11 insertions, 1 deletions
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) ->