diff options
| author | Lukas Larsson <[email protected]> | 2018-06-15 14:23:29 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-06-15 14:23:29 +0200 |
| commit | d6cd7d17e3b0dbcb9aac7bddb4bda31ffe4b598e (patch) | |
| tree | abbbba5867640d3e5f80bc6af2153c3117276b23 /lib | |
| parent | 1bf30863a847aec45799361d39ccd440346b2d6a (diff) | |
| parent | 9d68fe2fa12cb7a5770c58509158b328d1a41432 (diff) | |
| download | otp-d6cd7d17e3b0dbcb9aac7bddb4bda31ffe4b598e.tar.gz otp-d6cd7d17e3b0dbcb9aac7bddb4bda31ffe4b598e.tar.bz2 otp-d6cd7d17e3b0dbcb9aac7bddb4bda31ffe4b598e.zip | |
Merge branch 'lukas/otp_mibs/deprecate/OTP-15141'
* lukas/otp_mibs/deprecate/OTP-15141:
Update primary bootstrap
Deprecate otp_mibs
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/os_mon/doc/src/os_mon_mib.xml | 5 | ||||
| -rw-r--r-- | lib/otp_mibs/doc/src/otp_mib.xml | 5 | ||||
| -rw-r--r-- | lib/otp_mibs/src/otp_mib.erl | 3 | ||||
| -rw-r--r-- | lib/stdlib/src/otp_internal.erl | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/lib/os_mon/doc/src/os_mon_mib.xml b/lib/os_mon/doc/src/os_mon_mib.xml index dcf3649876..217d1e4804 100644 --- a/lib/os_mon/doc/src/os_mon_mib.xml +++ b/lib/os_mon/doc/src/os_mon_mib.xml @@ -35,7 +35,10 @@ <p>Functions for loading and unloading the OTP-OS-MON-MIB into/from an SNMP agent. The instrumentation of the OTP-OS-MON-MIB uses Mnesia, hence Mnesia must be started prior to loading - the OTP-OS-MON-MIB.</p> + the OTP-OS-MON-MIB.</p> + <warning> + <p>This module has been deprecated and will be removed in a furture release.</p> + </warning> </description> <funcs> <func> diff --git a/lib/otp_mibs/doc/src/otp_mib.xml b/lib/otp_mibs/doc/src/otp_mib.xml index 681ce9fa2d..adf3b00c7b 100644 --- a/lib/otp_mibs/doc/src/otp_mib.xml +++ b/lib/otp_mibs/doc/src/otp_mib.xml @@ -34,7 +34,10 @@ <p>The SNMP application should be used to start an SNMP agent. Then the API functions below can be used to load/unload the OTP-MIB into/from the agent. The instrumentation of the OTP-MIB uses - Mnesia, hence Mnesia must be started prior to loading the OTP-MIB.</p> + Mnesia, hence Mnesia must be started prior to loading the OTP-MIB.</p> + <warning> + <p>This application has been deprecated and will be removed in a furture release.</p> + </warning> </description> <funcs> <func> diff --git a/lib/otp_mibs/src/otp_mib.erl b/lib/otp_mibs/src/otp_mib.erl index 1431818be4..d18afd9bbd 100644 --- a/lib/otp_mibs/src/otp_mib.erl +++ b/lib/otp_mibs/src/otp_mib.erl @@ -36,6 +36,9 @@ %% Exported for internal use via rpc -export([get_erl_node/1, get_appls/1]). +-deprecated([{load,1,eventually}, + {unload,1,eventually}]). + %% Shadow tables -record(erlNodeTable, {erlNodeId, erlNodeName, erlNodeMachine, erlNodeVersion, diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl index ceec3079a1..24d6e384d6 100644 --- a/lib/stdlib/src/otp_internal.erl +++ b/lib/stdlib/src/otp_internal.erl @@ -620,6 +620,8 @@ obsolete_1(ssl, ssl_accept, 2) -> {deprecated, "deprecated; use ssl:handshake/2 instead"}; obsolete_1(ssl, ssl_accept, 3) -> {deprecated, "deprecated; use ssl:handshake/3 instead"}; +obsolete_1(otp_mib, F, _) when F =:= load; F =:= unload -> + {deprecated, "deprecated; functionality will be removed in a future release"}; %% not obsolete |