aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2013-05-28 17:23:06 +0200
committerMicael Karlberg <[email protected]>2013-05-28 17:23:06 +0200
commita6c76247fa67e86c12773e2d997c66c9f794b002 (patch)
tree152b2eb5983ae14bf4947a997428a1ebf36e6f1c /lib/stdlib/src
parent1fadb8a6744b282659cecba754b9678ef9761d8c (diff)
parent8f541e4959d4f58480beac053cc76613cd208837 (diff)
downloadotp-a6c76247fa67e86c12773e2d997c66c9f794b002.tar.gz
otp-a6c76247fa67e86c12773e2d997c66c9f794b002.tar.bz2
otp-a6c76247fa67e86c12773e2d997c66c9f794b002.zip
Merge branch 'bmk/snmp/agent/mib_storage_behaviour/OTP-11107' into bmk/snmp/snmp424_integration/r16
Conflicts: lib/snmp/doc/src/notes.xml
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/otp_internal.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 42a42b7fd7..cebc9c91bd 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -250,10 +250,12 @@ obsolete_1(snmp, N, A) ->
false ->
no;
true ->
- {deprecated,"Deprecated; use snmpa:"++atom_to_list(N)++"/"++
+ {deprecated, "Deprecated (will be removed in R17B); use snmpa:"++atom_to_list(N)++"/"++
integer_to_list(A)++" instead"}
end;
+obsolete_1(snmpa, old_info_format, 1) ->
+ {deprecated, "Deprecated; (will be removed in R17B); use \"new\" format instead"};
obsolete_1(snmpm, agent_info, 3) ->
{removed, {snmpm, agent_info, 2}, "R16B"};
obsolete_1(snmpm, update_agent_info, 5) ->