diff options
| author | Siri Hansen <[email protected]> | 2016-02-10 11:21:42 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-02-10 11:21:42 +0100 |
| commit | 505a69774fe789bbf7c264574f360c683dd0fcc3 (patch) | |
| tree | 89358837669643af0dd0d93c4dd995608c3ea11e /lib/sasl/test | |
| parent | baf313fb8b603bb249ed1c30207ceb47aa52aff9 (diff) | |
| parent | 8fba155bdc0b45f0504756d1ea695d9c53a44f80 (diff) | |
| download | otp-505a69774fe789bbf7c264574f360c683dd0fcc3.tar.gz otp-505a69774fe789bbf7c264574f360c683dd0fcc3.tar.bz2 otp-505a69774fe789bbf7c264574f360c683dd0fcc3.zip | |
Merge branch 'maint'
Conflicts:
lib/stdlib/src/supervisor.erl
Diffstat (limited to 'lib/sasl/test')
| -rw-r--r-- | lib/sasl/test/release_handler_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl index d57de2593a..ee620dcdb4 100644 --- a/lib/sasl/test/release_handler_SUITE.erl +++ b/lib/sasl/test/release_handler_SUITE.erl @@ -1363,7 +1363,7 @@ upgrade_supervisor(Conf) when is_list(Conf) -> %% Check that the restart strategy and child spec is updated {status, _, {module, _}, [_, _, _, _, [_,_,{data,[{"State",State}]}]]} = rpc:call(Node,sys,get_status,[a_sup]), - {state,_,RestartStrategy,[Child],_,_,_,_,_,_} = State, + {state,_,RestartStrategy,[Child],_,_,_,_,_,_,_} = State, one_for_all = RestartStrategy, % changed from one_for_one {child,_,_,_,_,brutal_kill,_,_} = Child, % changed from timeout 2000 |