diff options
| author | Micael Karlberg <[email protected]> | 2012-01-20 13:52:09 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-01-20 13:52:09 +0100 |
| commit | a40219d66d90508775cf801ec5e2b1ffcef4124e (patch) | |
| tree | f0917c7d52fe841d670b7846cc5d8d7136cb3d08 /lib/snmp/vsn.mk | |
| parent | ef4af949a1f946c965997957e10cb638e7d01c22 (diff) | |
| parent | dda02f0e90a72620745878e4834849029f3e616d (diff) | |
| download | otp-a40219d66d90508775cf801ec5e2b1ffcef4124e.tar.gz otp-a40219d66d90508775cf801ec5e2b1ffcef4124e.tar.bz2 otp-a40219d66d90508775cf801ec5e2b1ffcef4124e.zip | |
Merge branch 'bmk/snmp/agent/update_mibs_cache_funcs/OTP-9868' into bmk/snmp/snmp4173_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.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk index 0bfd5c92ac..3ab08eca58 100644 --- a/lib/snmp/vsn.mk +++ b/lib/snmp/vsn.mk @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2011. All Rights Reserved. +# Copyright Ericsson AB 1997-2012. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -21,7 +21,7 @@ SNMP_VSN = 4.17.3 PRE_VSN = APP_VSN = "snmp-$(SNMP_VSN)$(PRE_VSN)" -TICKETS = OTP-9700 +TICKETS = OTP-9700 OTP-9868 TICKETS_4_17_2 = OTP-9236 |