diff options
| author | Siri Hansen <[email protected]> | 2011-11-10 11:43:37 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2011-11-17 16:59:09 +0100 |
| commit | 19fc8435cbc938f102ffcd0bcbabfc0371dcccb9 (patch) | |
| tree | 92a0f4138d6fbe8f5fe06f7c70af43467dd33a99 | |
| parent | af6941a5265ed613df26fccba3e234c24094405f (diff) | |
| download | otp-19fc8435cbc938f102ffcd0bcbabfc0371dcccb9.tar.gz otp-19fc8435cbc938f102ffcd0bcbabfc0371dcccb9.tar.bz2 otp-19fc8435cbc938f102ffcd0bcbabfc0371dcccb9.zip | |
Add release vsn info to erts_vsn_changed warning
| -rw-r--r-- | lib/sasl/src/systools_relup.erl | 2 | ||||
| -rw-r--r-- | lib/sasl/test/release_handler_SUITE.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sasl/src/systools_relup.erl b/lib/sasl/src/systools_relup.erl index 57e375b03e..8376e278af 100644 --- a/lib/sasl/src/systools_relup.erl +++ b/lib/sasl/src/systools_relup.erl @@ -366,7 +366,7 @@ check_for_emulator_restart(#release{erts_vsn = Vsn1, name = N1}, %% erts version is changed. Also allow extra restart at the end of %% the upgrade if restart_emulator option is given. NewRUs = [[restart_new_emulator]|RUs], - NewWs = [{erts_vsn_changed, {N1, N2}} | Ws], + NewWs = [{erts_vsn_changed, {{N1,Vsn1}, {N2,Vsn2}}} | Ws], check_for_restart_emulator_opt(NewRUs, NewWs, Opts); check_for_emulator_restart(_, _, RUs, Ws, Opts) -> check_for_restart_emulator_opt(RUs, Ws, Opts). diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl index 12f86365a3..620d5b2761 100644 --- a/lib/sasl/test/release_handler_SUITE.erl +++ b/lib/sasl/test/release_handler_SUITE.erl @@ -618,7 +618,7 @@ supervisor_which_children_timeout(Conf) -> ok. -supervisor_which_children_timeout(cleanup, Conf) -> +supervisor_which_children_timeout(cleanup, _Conf) -> stop_node(node_name(supervisor_which_children_timeout)). |