diff options
| author | Micael Karlberg <[email protected]> | 2013-11-18 18:09:18 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2013-11-18 18:09:18 +0100 |
| commit | 93e3c5286080380cbcee45d96b0893206721590f (patch) | |
| tree | 9da67708cb928fc8f4edd8ac7de6f0617f0bf393 /lib/snmp/src/app | |
| parent | 78f27e212511db6b4c303f13dd698ba687fc459a (diff) | |
| parent | 57abd27ee8e189791c4d97ef86de6136c4924b52 (diff) | |
| download | otp-93e3c5286080380cbcee45d96b0893206721590f.tar.gz otp-93e3c5286080380cbcee45d96b0893206721590f.tar.bz2 otp-93e3c5286080380cbcee45d96b0893206721590f.zip | |
Merge branch 'bmk/snmp/handling_corrupt_atl_when_converting/OTP-11453' into bmk/snmp/snmp4223_integration
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
lib/snmp/src/misc/snmp_log.erl
Diffstat (limited to 'lib/snmp/src/app')
| -rw-r--r-- | lib/snmp/src/app/snmp.appup.src | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src index 69237838ab..31f56cb73c 100644 --- a/lib/snmp/src/app/snmp.appup.src +++ b/lib/snmp/src/app/snmp.appup.src @@ -24,13 +24,13 @@ [ {"4.22.2", [ - {load_module, snmp_log, soft_purge, soft_purge, [snmp_verbosity]}, + {load_module, snmp_log, soft_purge, soft_purge, [snmp_verbosity]}, {load_module, snmp_verbosity, soft_purge, soft_purge, []} ] }, {"4.22.1", [ - {load_module, snmp_log, soft_purge, soft_purge, [snmp_verbosity]}, + {load_module, snmp_log, soft_purge, soft_purge, [snmp_verbosity]}, {load_module, snmp_verbosity, soft_purge, soft_purge, []} ] }, @@ -328,13 +328,13 @@ [ {"4.22.2", [ - {load_module, snmp_log, soft_purge, soft_purge, [snmp_verbosity]}, + {load_module, snmp_log, soft_purge, soft_purge, [snmp_verbosity]}, {load_module, snmp_verbosity, soft_purge, soft_purge, []} ] }, {"4.22.1", [ - {load_module, snmp_log, soft_purge, soft_purge, [snmp_verbosity]}, + {load_module, snmp_log, soft_purge, soft_purge, [snmp_verbosity]}, {load_module, snmp_verbosity, soft_purge, soft_purge, []} ] }, |