diff options
| author | Siri Hansen <[email protected]> | 2016-01-27 11:12:37 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-01-27 11:12:37 +0100 |
| commit | 15b30187b04de04709bd7fe988929a18f97e70f9 (patch) | |
| tree | eaf84b9b5919b84af9eb34af75c14b7697a74582 /lib/stdlib | |
| parent | ce80dc1483f597303d25a0994772b13b8b6ee305 (diff) | |
| parent | 5ebe9f68a34716eeb3739762e39f9afb4a945932 (diff) | |
| download | otp-15b30187b04de04709bd7fe988929a18f97e70f9.tar.gz otp-15b30187b04de04709bd7fe988929a18f97e70f9.tar.bz2 otp-15b30187b04de04709bd7fe988929a18f97e70f9.zip | |
Merge branch 'maint'
Conflicts:
lib/stdlib/src/otp_internal.erl
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/src/otp_internal.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl index 960c70f255..bc70c296da 100644 --- a/lib/stdlib/src/otp_internal.erl +++ b/lib/stdlib/src/otp_internal.erl @@ -647,6 +647,9 @@ obsolete_1(random, _, _) -> obsolete_1(code, rehash, 0) -> {deprecated, "deprecated because the code path cache feature has been removed"}; +obsolete_1(overload, _, _) -> + {deprecated, "deprecated; will be removed in OTP 19"}; + obsolete_1(_, _, _) -> no. |