aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/app
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-08-01 18:29:23 +0200
committerMicael Karlberg <[email protected]>2012-08-01 18:29:23 +0200
commit79246395195107336cd07ad123eb9ce947f3335a (patch)
tree3d8c5d3e111aa06f993d56e8119b13cf4ebc1274 /lib/snmp/src/app
parent4d6c68beddbd20392882c74d7ba71d3d6e55a43a (diff)
parent6c3ce92734fe80bec370857a83ccf375c3f20565 (diff)
downloadotp-79246395195107336cd07ad123eb9ce947f3335a.tar.gz
otp-79246395195107336cd07ad123eb9ce947f3335a.tar.bz2
otp-79246395195107336cd07ad123eb9ce947f3335a.zip
Merge branch 'bmk/snmp/agent/vacmAccessTable-RowStatus-handling/OTP-10164' into bmk/snmp/snmp4221_integration
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.src10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 91dfc50dc9..3991cdbce8 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -24,8 +24,9 @@
[
{"4.22",
[
- {load_module, snmpm, soft_purge, soft_purge, []},
- {load_module, snmp_pdus, soft_purge, soft_purge, []}
+ {load_module, snmpm, soft_purge, soft_purge, []},
+ {load_module, snmp_pdus, soft_purge, soft_purge, []},
+ {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}
]
},
{"4.21.7",
@@ -312,8 +313,9 @@
[
{"4.22",
[
- {load_module, snmpm, soft_purge, soft_purge, []},
- {load_module, snmp_pdus, soft_purge, soft_purge, []}
+ {load_module, snmpm, soft_purge, soft_purge, []},
+ {load_module, snmp_pdus, soft_purge, soft_purge, []},
+ {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}
]
},
{"4.21.7",