diff options
| author | Erlang/OTP <[email protected]> | 2017-10-09 15:00:09 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-10-09 15:00:09 +0200 |
| commit | b3b8793136906b5d6b93706e4f4c8ba12f95b612 (patch) | |
| tree | 360cb50effa79af7b3dfe556879c3da9c0d8efdd /lib | |
| parent | 760b3cde56740bd5d4aa5186b59a9b3600f6f7b1 (diff) | |
| parent | 0330a700879b3ada5a288e62d008b78cb7603fbe (diff) | |
| download | otp-b3b8793136906b5d6b93706e4f4c8ba12f95b612.tar.gz otp-b3b8793136906b5d6b93706e4f4c8ba12f95b612.tar.bz2 otp-b3b8793136906b5d6b93706e4f4c8ba12f95b612.zip | |
Merge branch 'anders/diameter/reg_monitor/OTP-14668' into maint-20
* anders/diameter/reg_monitor/OTP-14668:
vsn -> 2.1.1
Update appup and code_change for ERIERL-83
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/diameter/src/base/diameter_reg.erl | 5 | ||||
| -rw-r--r-- | lib/diameter/src/diameter.appup.src | 6 | ||||
| -rw-r--r-- | lib/diameter/vsn.mk | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/lib/diameter/src/base/diameter_reg.erl b/lib/diameter/src/base/diameter_reg.erl index e0c41a2834..5b7cfab31a 100644 --- a/lib/diameter/src/base/diameter_reg.erl +++ b/lib/diameter/src/base/diameter_reg.erl @@ -298,6 +298,11 @@ terminate(_Reason, _State)-> %% # code_change/3 %% ---------------------------------------------------------- +code_change(_, State, "2.1") -> + {ok, lists:foldl(fun add_monitor/2, + State, + ets:select(?TABLE, [{{'_', '$1'}, [], ['$1']}]))}; + code_change(_OldVsn, State, _Extra) -> {ok, State}. diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src index 7566cf25c3..c2198de9ea 100644 --- a/lib/diameter/src/diameter.appup.src +++ b/lib/diameter/src/diameter.appup.src @@ -53,7 +53,8 @@ {"1.12", [{restart_application, diameter}]}, %% 19.0 {"1.12.1", [{restart_application, diameter}]}, %% 19.1 {"1.12.2", [{restart_application, diameter}]}, %% 19.3 - {"2.0", [{restart_application, diameter}]} %% 20.0 + {"2.0", [{restart_application, diameter}]}, %% 20.0 + {"2.1", [{update, diameter_reg, {advanced, "2.1"}}]} %% 20.1 ], [ {"0.9", [{restart_application, diameter}]}, @@ -88,6 +89,7 @@ {"1.12", [{restart_application, diameter}]}, {"1.12.1", [{restart_application, diameter}]}, {"1.12.2", [{restart_application, diameter}]}, - {"2.0", [{restart_application, diameter}]} + {"2.0", [{restart_application, diameter}]}, + {"2.1", [{restart_application, diameter}]} ] }. diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk index e6dfddb5b2..f73f68da0b 100644 --- a/lib/diameter/vsn.mk +++ b/lib/diameter/vsn.mk @@ -17,5 +17,5 @@ # %CopyrightEnd% APPLICATION = diameter -DIAMETER_VSN = 2.1 +DIAMETER_VSN = 2.1.1 APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN) |