diff options
author | Micael Karlberg <[email protected]> | 2013-11-26 16:12:46 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2013-11-26 16:12:46 +0100 |
commit | 0f13b20298fd6f63a08d6fa1d1159a91d79fa1f6 (patch) | |
tree | a0e2ca49909defa1da5af2b7eaf24faf14f32a2c /lib/snmp/src/app/snmp.appup.src | |
parent | 6dd7c114b018ac412ed0d5c3423e988094aa9655 (diff) | |
parent | 8852c947d413e8814d663c9319f7b8932b05a7ad (diff) | |
download | otp-0f13b20298fd6f63a08d6fa1d1159a91d79fa1f6.tar.gz otp-0f13b20298fd6f63a08d6fa1d1159a91d79fa1f6.tar.bz2 otp-0f13b20298fd6f63a08d6fa1d1159a91d79fa1f6.zip |
Merge branch 'maint'
Conflicts:
lib/snmp/doc/src/snmpm_user.xml
Diffstat (limited to 'lib/snmp/src/app/snmp.appup.src')
-rw-r--r-- | lib/snmp/src/app/snmp.appup.src | 43 |
1 files changed, 6 insertions, 37 deletions
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src index 6edcf7e833..fa4b72ab68 100644 --- a/lib/snmp/src/app/snmp.appup.src +++ b/lib/snmp/src/app/snmp.appup.src @@ -27,26 +27,10 @@ %% {load_module, snmp_pdus, soft_purge, soft_purge, []} %% {update, snmpa_local_db, soft, soft_purge, soft_purge, []} %% {add_module, snmpm_net_if_mt} - [ - {"4.24.1", - [ - {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]}, - {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_agent]}, - {update, snmpa_mib, soft, soft_purge, soft_purge, []} - ] - }, - {"4.24", - [ - {load_module, snmp_conf, soft_purge, soft_purge, []}, - {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, - [snmp_conf]}, - {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]}, - {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, - {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_agent]}, - {update, snmpa_mib, soft, soft_purge, soft_purge, []} - ] - }, + {"4.24.2", [{restart_application, snmp}]}, + {"4.24.1", [{restart_application, snmp}]}, + {"4.24", [{restart_application, snmp}]}, {"4.23.1", [{restart_application, snmp}]}, {"4.23", [{restart_application, snmp}]} ], @@ -57,24 +41,9 @@ %% {remove, {snmpm_net_if_mt, soft_purge, soft_purge}} [ - {"4.24.1", - [ - {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]}, - {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_agent]}, - {update, snmpa_mib, soft, soft_purge, soft_purge, []} - ] - }, - {"4.24", - [ - {load_module, snmp_conf, soft_purge, soft_purge, []}, - {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, - [snmp_conf]}, - {load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]}, - {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, - {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_agent]}, - {update, snmpa_mib, soft, soft_purge, soft_purge, []} - ] - }, + {"4.24.2", [{restart_application, snmp}]}, + {"4.24.1", [{restart_application, snmp}]}, + {"4.24", [{restart_application, snmp}]}, {"4.23.1", [{restart_application, snmp}]}, {"4.23", [{restart_application, snmp}]} ] |