diff options
| author | Micael Karlberg <[email protected]> | 2018-09-17 15:23:05 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2018-09-17 15:23:05 +0200 |
| commit | fd3d7e7ce693bb960b85b3ea09429adb30145e49 (patch) | |
| tree | c21f97277a63b6c81456a917b61f6abcefaf3d5a | |
| parent | b91036d475c2499ffa6dcf5714e0e155d05b43a4 (diff) | |
| parent | f5eafaca46bb254e068a2c6deb72267c8be72337 (diff) | |
| download | otp-fd3d7e7ce693bb960b85b3ea09429adb30145e49.tar.gz otp-fd3d7e7ce693bb960b85b3ea09429adb30145e49.tar.bz2 otp-fd3d7e7ce693bb960b85b3ea09429adb30145e49.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/snmp/src/compile/snmpc.erl | 6 | ||||
| -rw-r--r-- | lib/snmp/vsn.mk | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/lib/snmp/src/compile/snmpc.erl b/lib/snmp/src/compile/snmpc.erl index 7f627d66d9..c810bfcd41 100644 --- a/lib/snmp/src/compile/snmpc.erl +++ b/lib/snmp/src/compile/snmpc.erl @@ -169,11 +169,7 @@ get_version() -> MI = ?MODULE:module_info(), Attr = get_info(attributes, MI), Vsn = get_info(app_vsn, Attr), - Comp = get_info(compile, MI), - Time = get_info(time, Comp), - {Year, Month, Day, Hour, Min, Sec} = Time, - io_lib:format("~s [~.4w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w]", - [Vsn, Year, Month, Day, Hour, Min, Sec]). + Vsn. maybe_display_options(Opts) -> case lists:member(options, Opts) of diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk index 96123f02f5..4d5a0fbce8 100644 --- a/lib/snmp/vsn.mk +++ b/lib/snmp/vsn.mk @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2017. All Rights Reserved. +# Copyright Ericsson AB 1997-2018. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = snmp -SNMP_VSN = 5.2.11 +SNMP_VSN = 5.2.12 PRE_VSN = APP_VSN = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)" |