diff options
author | Micael Karlberg <[email protected]> | 2013-05-28 17:14:13 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2013-05-28 17:14:13 +0200 |
commit | 1fadb8a6744b282659cecba754b9678ef9761d8c (patch) | |
tree | 4ce5c743c58ffb3ad765429591deae55264f5d98 /lib/snmp/src/app/snmp.appup.src | |
parent | a9244ce9be2d73397ed71fb9d7d5986c5f70e202 (diff) | |
parent | 3ffa5b5c87518b6579f48b935cb67c7eb22b10b4 (diff) | |
download | otp-1fadb8a6744b282659cecba754b9678ef9761d8c.tar.gz otp-1fadb8a6744b282659cecba754b9678ef9761d8c.tar.bz2 otp-1fadb8a6744b282659cecba754b9678ef9761d8c.zip |
Merge branch 'bmk/snmp/agent/mib_server_data_callback/OTP-11101' into bmk/snmp/snmp424_integration/r16
Conflicts:
lib/snmp/doc/src/notes.xml
Diffstat (limited to 'lib/snmp/src/app/snmp.appup.src')
-rw-r--r-- | lib/snmp/src/app/snmp.appup.src | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src index 4c5f14da90..7ffa4a725d 100644 --- a/lib/snmp/src/app/snmp.appup.src +++ b/lib/snmp/src/app/snmp.appup.src @@ -22,19 +22,15 @@ %% ----- U p g r a d e ------------------------------------------------------- [ - {"4.23", - [ - ] - } + {"4.23.1", [{restart_application, snmp}]}, + {"4.23", [{restart_application, snmp}]} ], %% ------D o w n g r a d e --------------------------------------------------- [ - {"4.23", - [ - ] - } + {"4.23.1", [{restart_application, snmp}]}, + {"4.23", [{restart_application, snmp}]} ] }. |