diff options
| author | Micael Karlberg <[email protected]> | 2011-09-05 11:56:22 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-05 11:56:22 +0200 |
| commit | 0b77ab1f96be0388b6d69c1ddbc2e73d11e8cd0e (patch) | |
| tree | 9d98e198a2d21846daf65aec1ae30314541b3b34 /lib/snmp/src/app/snmp.appup.src | |
| parent | 4a58f611253c6c17e6183c013f2f766d6beb4cca (diff) | |
| parent | f907baa3d7a64436b43e404c014669bf3ee67eba (diff) | |
| download | otp-0b77ab1f96be0388b6d69c1ddbc2e73d11e8cd0e.tar.gz otp-0b77ab1f96be0388b6d69c1ddbc2e73d11e8cd0e.tar.bz2 otp-0b77ab1f96be0388b6d69c1ddbc2e73d11e8cd0e.zip | |
Merge branch 'bmk/snmp/agent/debugging_improvements/OTP-9446' into bmk/snmp/snmp4211_integration
Conflicts:
lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'lib/snmp/src/app/snmp.appup.src')
| -rw-r--r-- | lib/snmp/src/app/snmp.appup.src | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src index 22817bc21d..0b6ea93231 100644 --- a/lib/snmp/src/app/snmp.appup.src +++ b/lib/snmp/src/app/snmp.appup.src @@ -24,10 +24,12 @@ [ {"4.21", [ + {load_module, snmp_target_mib, soft_purge, soft_purge, []} ] }, {"4.20.1", [ + {load_module, snmp_target_mib, soft_purge, soft_purge, []}, {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, {load_module, snmpm, soft_purge, soft_purge, [snmpm_server, snmpm_config, snmp_config]}, @@ -115,10 +117,12 @@ [ {"4.21", [ + {load_module, snmp_target_mib, soft_purge, soft_purge, []} ] }, {"4.20.1", [ + {load_module, snmp_target_mib, soft_purge, soft_purge, []}, {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, {load_module, snmpm, soft_purge, soft_purge, [snmpm_server, snmpm_config, snmp_config]}, |