aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/vsn.mk
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-01-27 11:32:14 +0100
committerMicael Karlberg <[email protected]>2012-01-27 11:32:14 +0100
commit980c05769a4146197e5eb0175c6ffacbf4d5634c (patch)
tree4b3249ae0822213e59d7bd371ebe09d6eda32246 /lib/snmp/vsn.mk
parent657ed77ace68a05d2b63ca5db77bce08f64a0e90 (diff)
parent36196c2b7684d07c15220bc5794ddfb487ddfc34 (diff)
downloadotp-980c05769a4146197e5eb0175c6ffacbf4d5634c.tar.gz
otp-980c05769a4146197e5eb0175c6ffacbf4d5634c.tar.bz2
otp-980c05769a4146197e5eb0175c6ffacbf4d5634c.zip
Merge branch 'bmk/snmp/agent/wrong_oid_for_snmpUnknownPDUHandlers2/OTP-9747/r13' into bmk/snmp/snmp4174_integration/r13
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/vsn.mk
Diffstat (limited to 'lib/snmp/vsn.mk')
-rw-r--r--lib/snmp/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 6605b17638..54e80de84e 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -21,7 +21,7 @@ SNMP_VSN = 4.17.4
PRE_VSN =
APP_VSN = "snmp-$(SNMP_VSN)$(PRE_VSN)"
-TICKETS = OTP-9884
+TICKETS = OTP-9884 OTP-9747
TICKETS_4_17_3 = OTP-9700 OTP-9868