From c527ba3a2bed6e60d8a832e7977c3d8e8476a504 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Wed, 13 Jun 2018 15:47:58 +0200 Subject: Deprecate otp_mibs --- lib/os_mon/doc/src/os_mon_mib.xml | 5 ++++- lib/otp_mibs/doc/src/otp_mib.xml | 5 ++++- lib/otp_mibs/src/otp_mib.erl | 3 +++ 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 @@

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.

+ the OTP-OS-MON-MIB.

+ +

This module has been deprecated and will be removed in a furture release.

+ 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 @@

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.

+ Mnesia, hence Mnesia must be started prior to loading the OTP-MIB.

+ +

This application has been deprecated and will be removed in a furture release.

+ 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 -- cgit v1.2.3 From 9d68fe2fa12cb7a5770c58509158b328d1a41432 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Wed, 13 Jun 2018 16:17:37 +0200 Subject: Update primary bootstrap --- .../lib/kernel/ebin/application_controller.beam | Bin 31212 -> 31196 bytes bootstrap/lib/kernel/ebin/logger_server.beam | Bin 10460 -> 10476 bytes bootstrap/lib/kernel/ebin/net_kernel.beam | Bin 25560 -> 25644 bytes bootstrap/lib/stdlib/ebin/gen_statem.beam | Bin 20676 -> 20676 bytes bootstrap/lib/stdlib/ebin/io_lib_pretty.beam | Bin 21948 -> 21956 bytes bootstrap/lib/stdlib/ebin/maps.beam | Bin 3464 -> 3520 bytes bootstrap/lib/stdlib/ebin/otp_internal.beam | Bin 10528 -> 10596 bytes bootstrap/lib/stdlib/ebin/uri_string.beam | Bin 26712 -> 26396 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/bootstrap/lib/kernel/ebin/application_controller.beam b/bootstrap/lib/kernel/ebin/application_controller.beam index 4cc77ec55c..ed876f4d6a 100644 Binary files a/bootstrap/lib/kernel/ebin/application_controller.beam and b/bootstrap/lib/kernel/ebin/application_controller.beam differ diff --git a/bootstrap/lib/kernel/ebin/logger_server.beam b/bootstrap/lib/kernel/ebin/logger_server.beam index 72a14acce3..4885c0992a 100644 Binary files a/bootstrap/lib/kernel/ebin/logger_server.beam and b/bootstrap/lib/kernel/ebin/logger_server.beam differ diff --git a/bootstrap/lib/kernel/ebin/net_kernel.beam b/bootstrap/lib/kernel/ebin/net_kernel.beam index 03627a3d53..0a565d542d 100644 Binary files a/bootstrap/lib/kernel/ebin/net_kernel.beam and b/bootstrap/lib/kernel/ebin/net_kernel.beam differ diff --git a/bootstrap/lib/stdlib/ebin/gen_statem.beam b/bootstrap/lib/stdlib/ebin/gen_statem.beam index ebdb70b93c..1c1b93a036 100644 Binary files a/bootstrap/lib/stdlib/ebin/gen_statem.beam and b/bootstrap/lib/stdlib/ebin/gen_statem.beam differ diff --git a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam index de468aacca..dc91c318c5 100644 Binary files a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam and b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam differ diff --git a/bootstrap/lib/stdlib/ebin/maps.beam b/bootstrap/lib/stdlib/ebin/maps.beam index 85e997bb1c..ec0ebce58a 100644 Binary files a/bootstrap/lib/stdlib/ebin/maps.beam and b/bootstrap/lib/stdlib/ebin/maps.beam differ diff --git a/bootstrap/lib/stdlib/ebin/otp_internal.beam b/bootstrap/lib/stdlib/ebin/otp_internal.beam index ab99005d7a..c42b18f6cf 100644 Binary files a/bootstrap/lib/stdlib/ebin/otp_internal.beam and b/bootstrap/lib/stdlib/ebin/otp_internal.beam differ diff --git a/bootstrap/lib/stdlib/ebin/uri_string.beam b/bootstrap/lib/stdlib/ebin/uri_string.beam index e14164a823..36aec511d8 100644 Binary files a/bootstrap/lib/stdlib/ebin/uri_string.beam and b/bootstrap/lib/stdlib/ebin/uri_string.beam differ -- cgit v1.2.3