aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/app
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2013-02-05 17:26:48 +0100
committerMicael Karlberg <[email protected]>2013-02-05 17:26:48 +0100
commit9d28f76402347f498d3c2175ac41a2591d7091b1 (patch)
tree8426b728395d8f742a51d5f3c66322da77ea5fa2 /lib/snmp/src/app
parent68b804f34d4ec420d86953e3f519179a40fbee8f (diff)
parentfc328fa1c24bbf0ca27d553266c90fb29427cd5f (diff)
downloadotp-9d28f76402347f498d3c2175ac41a2591d7091b1.tar.gz
otp-9d28f76402347f498d3c2175ac41a2591d7091b1.tar.bz2
otp-9d28f76402347f498d3c2175ac41a2591d7091b1.zip
Merge branch 'bmk/snmp/snmp4222_integration/r15' into bmk/snmp/snmp4231_integration/r16
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
Diffstat (limited to 'lib/snmp/src/app')
-rw-r--r--lib/snmp/src/app/snmp.appup.src8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index a6abf8439a..4c5f14da90 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,11 +22,19 @@
%% ----- U p g r a d e -------------------------------------------------------
[
+ {"4.23",
+ [
+ ]
+ }
],
%% ------D o w n g r a d e ---------------------------------------------------
[
+ {"4.23",
+ [
+ ]
+ }
]
}.