diff options
| author | Hans Bolinder <[email protected]> | 2010-09-02 13:58:31 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2010-09-02 13:58:31 +0200 |
| commit | e687346cace88b81053d603481f881be49915973 (patch) | |
| tree | e650cfdb30e18c862229dce052302456a2e7e372 | |
| parent | 9ea58dff408c0c72f5a6ad0e11b521a80292b024 (diff) | |
| parent | f673a2e5b4ae4bb2c3ecf4716b5e34b394cc4c08 (diff) | |
| download | otp-e687346cace88b81053d603481f881be49915973.tar.gz otp-e687346cace88b81053d603481f881be49915973.tar.bz2 otp-e687346cace88b81053d603481f881be49915973.zip | |
Merge branch 'maint-r13' into dev
Conflicts:
lib/kernel/doc/src/notes.xml
lib/kernel/vsn.mk
| -rw-r--r-- | lib/kernel/src/net_kernel.erl | 4 | ||||
| -rw-r--r-- | lib/kernel/test/erl_distribution_SUITE.erl | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl index 0e5cc8c2c6..f5e2820bbe 100644 --- a/lib/kernel/src/net_kernel.erl +++ b/lib/kernel/src/net_kernel.erl @@ -500,8 +500,8 @@ handle_call({new_ticktime,T,TP}, From, #state{tick = #tick{ticker = Tckr, time = T, how = How}}}, From); -handle_call({new_ticktime,From,_}, - _, +handle_call({new_ticktime,_T,_TP}, + From, #state{tick = #tick_change{time = T}} = State) -> async_reply({reply, {ongoing_change_to, T}, State}, From); diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl index d15f6aa0d5..21a96f804a 100644 --- a/lib/kernel/test/erl_distribution_SUITE.erl +++ b/lib/kernel/test/erl_distribution_SUITE.erl @@ -273,6 +273,7 @@ tick_change(Config) when is_list(Config) -> ?line PaDir = filename:dirname(code:which(?MODULE)), ?line [BN, CN] = get_nodenames(2, tick_change), ?line DefaultTT = net_kernel:get_net_ticktime(), + ?line unchanged = net_kernel:set_net_ticktime(DefaultTT, 60), ?line case DefaultTT of I when is_integer(I) -> ?line ok; _ -> ?line ?t:fail(DefaultTT) @@ -377,6 +378,7 @@ run_tick_change_test(B, C, PrevTT, TT, PaDir) -> end, ?line change_initiated = net_kernel:set_net_ticktime(TT,20), + ?line {ongoing_change_to,_} = net_kernel:set_net_ticktime(TT,20), ?line sleep(3), ?line change_initiated = rpc:call(B,net_kernel,set_net_ticktime,[TT,15]), ?line sleep(7), |