aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/app
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-08-14 16:16:49 +0200
committerMicael Karlberg <[email protected]>2012-08-14 16:16:49 +0200
commit20be9649a6c11ab01f44fb375a50de43f8142b45 (patch)
treea231387d16fd660525bdc1d0e01ddb6702d8d294 /lib/snmp/src/app
parent8b70cc1a933b6d05ce91679b77fc3a496ad41266 (diff)
parent3cdb7781aca3cfff24485f7a9dbe704a4824d5e1 (diff)
downloadotp-20be9649a6c11ab01f44fb375a50de43f8142b45.tar.gz
otp-20be9649a6c11ab01f44fb375a50de43f8142b45.tar.bz2
otp-20be9649a6c11ab01f44fb375a50de43f8142b45.zip
Merge branch 'bmk/snmp/bad_decode_TimeTicks/maint/OTP-10132' into bmk/snmp/snmp4221_integration2
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/src/misc/snmp_pdus.erl
Diffstat (limited to 'lib/snmp/src/app')
-rw-r--r--lib/snmp/src/app/snmp.appup.src4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 573ba8d0f5..593ddd82bd 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -27,7 +27,7 @@
{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, []},
- {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, []}
+ {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, []}
]
},
{"4.21.7",
@@ -317,7 +317,7 @@
{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, []},
- {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, []}
+ {load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, []}
]
},
{"4.21.7",