diff options
| author | Erlang/OTP <[email protected]> | 2011-11-14 14:28:13 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2011-11-14 14:28:13 +0100 |
| commit | 2541d05f29853e479fe078d5d5169ea16558291f (patch) | |
| tree | e3e0f4d1f0b679cf3c64fc38507e3903c3d90641 /lib/snmp/src/app/snmp.appup.src | |
| parent | f02b4691e1d53a49b1dda9e716649cad4f060ecc (diff) | |
| parent | b27432ee4f0d0809ea668cd9e4fcb4f601652cbd (diff) | |
| download | otp-2541d05f29853e479fe078d5d5169ea16558291f.tar.gz otp-2541d05f29853e479fe078d5d5169ea16558291f.tar.bz2 otp-2541d05f29853e479fe078d5d5169ea16558291f.zip | |
Merge branch 'bmk/snmp/20111108/bad_gc_timer_deactivation/OTP-9690' into maint-r14
* bmk/snmp/20111108/bad_gc_timer_deactivation/OTP-9690:
Bad note store GC timer deactivation. Wrong field in the state record was set (timeout instead active). Stefan Grundmann OTP-9690
Diffstat (limited to 'lib/snmp/src/app/snmp.appup.src')
| -rw-r--r-- | lib/snmp/src/app/snmp.appup.src | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src index 0b6ea93231..b4b5367169 100644 --- a/lib/snmp/src/app/snmp.appup.src +++ b/lib/snmp/src/app/snmp.appup.src @@ -22,8 +22,14 @@ %% ----- U p g r a d e ------------------------------------------------------- [ + {"4.21.1", + [ + {update, snmp_note_store, soft, soft_purge, soft_purge, []} + ] + }, {"4.21", [ + {update, snmp_note_store, soft, soft_purge, soft_purge, []}, {load_module, snmp_target_mib, soft_purge, soft_purge, []} ] }, @@ -40,6 +46,7 @@ {load_module, snmpa_mpd, soft_purge, soft_purge, [snmp_conf, snmp_config]}, {load_module, snmpa_conf, soft_purge, soft_purge, [snmp_config]}, + {update, snmp_note_store, soft, soft_purge, soft_purge, []}, {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mpd]}, {update, snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, {update, snmpm_server, soft, soft_purge, soft_purge, @@ -61,6 +68,7 @@ {load_module, snmpa_mpd, soft_purge, soft_purge, [snmp_conf, snmp_config]}, {load_module, snmpa_conf, soft_purge, soft_purge, [snmp_config]}, + {update, snmp_note_store, soft, soft_purge, soft_purge, []}, {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mpd]}, {update, snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, {update, snmpm_server, soft, soft_purge, soft_purge, @@ -99,6 +107,7 @@ {load_module, snmp_community_mib, soft_purge, soft_purge, []}, {load_module, snmp_target_mib, soft_purge, soft_purge, [snmp_conf]}, + {update, snmp_note_store, soft, soft_purge, soft_purge, []}, {update, snmpm_net_if, soft, soft_purge, soft_purge, [snmp_conf, snmpm_mpd, snmpm_config]}, {update, snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, @@ -115,8 +124,14 @@ %% ------D o w n g r a d e --------------------------------------------------- [ + {"4.21.1", + [ + {update, snmp_note_store, soft, soft_purge, soft_purge, []} + ] + }, {"4.21", [ + {update, snmp_note_store, soft, soft_purge, soft_purge, []}, {load_module, snmp_target_mib, soft_purge, soft_purge, []} ] }, @@ -133,6 +148,7 @@ {load_module, snmpa_mpd, soft_purge, soft_purge, [snmp_conf, snmp_config]}, {load_module, snmpa_conf, soft_purge, soft_purge, [snmp_config]}, + {update, snmp_note_store, soft, soft_purge, soft_purge, []}, {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mpd]}, {update, snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, {update, snmpm_server, soft, soft_purge, soft_purge, @@ -154,6 +170,7 @@ {load_module, snmpa_mpd, soft_purge, soft_purge, [snmp_conf, snmp_config]}, {load_module, snmpa_conf, soft_purge, soft_purge, [snmp_config]}, + {update, snmp_note_store, soft, soft_purge, soft_purge, []}, {update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mpd]}, {update, snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, {update, snmpm_server, soft, soft_purge, soft_purge, @@ -192,6 +209,7 @@ {load_module, snmp_community_mib, soft_purge, soft_purge, []}, {load_module, snmp_target_mib, soft_purge, soft_purge, [snmp_conf]}, + {update, snmp_note_store, soft, soft_purge, soft_purge, []}, {update, snmpm_net_if, soft, soft_purge, soft_purge, [snmp_conf, snmpm_mpd, snmpm_config]}, {update, snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, |