aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/app
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-04-18 16:36:53 +0200
committerMicael Karlberg <[email protected]>2011-04-18 16:36:53 +0200
commit42ef7086abd717e7a428804fe387b782abab9827 (patch)
treeb4e8bab2dc224ee0d71bd522fbd0bc36a2b69550 /lib/snmp/src/app
parent30a9f962d349f322f389ebc056e972f871e689a8 (diff)
parent9022ef27b8628ca680654d542b4d520426480c2d (diff)
downloadotp-42ef7086abd717e7a428804fe387b782abab9827.tar.gz
otp-42ef7086abd717e7a428804fe387b782abab9827.tar.bz2
otp-42ef7086abd717e7a428804fe387b782abab9827.zip
Merge branch 'bmk/snmp/agent/multi_engine_id_for_traps/OTP-9119' into bmk/agent/extra_info_notification/OTP-9183
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'lib/snmp/src/app')
-rw-r--r--lib/snmp/src/app/snmp.appup.src2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 46b2efffca..0d99a59958 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -39,6 +39,7 @@
[snmp_notification_mib]},
{load_module, snmp_notification_mib, soft_purge, soft_purge,
[snmp_conf, snmp_target_mib]},
+ {load_module, snmp_community_mib, soft_purge, soft_purge, []},
{load_module, snmp_target_mib, soft_purge, soft_purge,
[snmp_conf]},
{update, snmpa_net_if, soft, soft_purge, soft_purge,
@@ -112,6 +113,7 @@
[snmp_notification_mib]},
{load_module, snmp_notification_mib, soft_purge, soft_purge,
[snmp_conf, snmp_target_mib]},
+ {load_module, snmp_community_mib, soft_purge, soft_purge, []},
{load_module, snmp_target_mib, soft_purge, soft_purge,
[snmp_conf]},
{update, snmpa_net_if, soft, soft_purge, soft_purge,