Merge branch 'bjorn/kernel/remove-deprecated/OTP-13449'

* bjorn/kernel/remove-deprecated/OTP-13449:
  rpc: Remove functions deprecated in R12B

3 files changed, 4 insertions, 49 deletions

diff --git a/lib/kernel/doc/src/rpc.xml b/lib/kernel/doc/src/rpc.xml
index 032b4fb0c3..be1641ffd9 100644
--- a/lib/kernel/doc/src/rpc.xml
+++ b/lib/kernel/doc/src/rpc.xml
@@ -347,26 +347,6 @@
     </func>
 
     <func>
-      <name name="safe_multi_server_call" arity="2"/>
-      <name name="safe_multi_server_call" arity="3"/>
-      <fsummary>Interact with the servers on a number of nodes
-        (deprecated).</fsummary>
-      <desc>
-        <warning>
-          <p>Deprecated. Use
-          <seealso marker="#multi_server_call/2"><c>multi_server_call/2,3</c></seealso>
-          instead.</p>
-        </warning>
-        <p>In Erlang/OTP R6B and earlier releases,
-          <c>multi_server_call/2,3</c> could not handle the case
-          where the remote node exists, but there is no server called
-          <c><anno>Name</anno></c>. Instead, this function had to be used. In
-          Erlang/OTP R7B and later releases, however, the functions are
-          equivalent, except that this function is slightly slower.</p>
-      </desc>
-    </func>
-
-    <func>
       <name name="sbcast" arity="2"/>
       <fsummary>Broadcast a message synchronously to a registered process on
         all nodes.</fsummary>
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index b9284487d2..0e1e3f070c 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -52,10 +52,6 @@
 	 parallel_eval/1,
 	 pmap/3, pinfo/1, pinfo/2]).
 
-%% Deprecated calls.
--deprecated([{safe_multi_server_call,2},{safe_multi_server_call,3}]).
--export([safe_multi_server_call/2,safe_multi_server_call/3]).
-
 %% gen_server exports
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
 	 terminate/2, code_change/3]).
@@ -591,27 +587,6 @@ multi_server_call(Nodes, Name, Msg)
     Monitors = send_nodes(Nodes, Name, Msg, []),
     rec_nodes(Name, Monitors).
 
-%% Deprecated functions. Were only needed when communicating with R6 nodes.
-
--spec safe_multi_server_call(Name, Msg) -> {Replies, BadNodes} when
-      Name :: atom(),
-      Msg :: term(),
-      Replies :: [Reply :: term()],
-      BadNodes :: [node()].
-
-safe_multi_server_call(Name, Msg) ->
-    multi_server_call(Name, Msg).
-
--spec safe_multi_server_call(Nodes, Name, Msg) -> {Replies, BadNodes} when
-      Nodes :: [node()],
-      Name :: atom(),
-      Msg :: term(),
-      Replies :: [Reply :: term()],
-      BadNodes :: [node()].
-
-safe_multi_server_call(Nodes, Name, Msg) ->
-    multi_server_call(Nodes, Name, Msg).
-
 
 rec_nodes(Name, Nodes) -> 
     rec_nodes(Name, Nodes, [], []).
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index f92f061034..052dffdbfd 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -58,10 +58,6 @@ obsolete_1(erlang, now, 0) ->
 obsolete_1(calendar, local_time_to_universal_time, 1) ->
     {deprecated, {calendar, local_time_to_universal_time_dst, 1}};
 
-obsolete_1(rpc, safe_multi_server_call, A) when A =:= 2; A =:= 3 ->
-    {deprecated, {rpc, multi_server_call, A}};
-
-
 %% *** CRYPTO add in R16B01 ***
 
 obsolete_1(crypto, md4, 1) ->
@@ -541,8 +537,12 @@ obsolete_1(random, _, _) ->
 obsolete_1(code, rehash, 0) ->
     {deprecated, "deprecated because the code path cache feature has been removed"};
 
+%% Removed in OTP 19.
+
 obsolete_1(overload, _, _) ->
     {removed, "removed in OTP 19"};
+obsolete_1(rpc, safe_multi_server_call, A) when A =:= 2; A =:= 3 ->
+    {removed, {rpc, multi_server_call, A}};
 
 obsolete_1(_, _, _) ->
     no.