diff options
| author | Anders Svensson <[email protected]> | 2015-08-13 17:08:15 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-08-13 23:01:28 +0200 |
| commit | 8c5d719afaeae0c9cfa1079c0de5452f8bdc837b (patch) | |
| tree | c886baae9730405c7dafac7549e9a1246aac686a /lib/diameter/test/diameter_examples_SUITE.erl | |
| parent | c972a98fe58569d661e9bfad5512bcdb498f6200 (diff) | |
| parent | 155c22ff3ce3f667d4a984bd6648f029e0998381 (diff) | |
| download | otp-8c5d719afaeae0c9cfa1079c0de5452f8bdc837b.tar.gz otp-8c5d719afaeae0c9cfa1079c0de5452f8bdc837b.tar.bz2 otp-8c5d719afaeae0c9cfa1079c0de5452f8bdc837b.zip | |
Merge branch 'maint-17' into maint
The diffs are all about adapting to the OTP 18 time interface. The code
was previously backwards compatible, falling back on the erlang:now/0 if
erlang:monotonic_time/0 is unavailable, but this was seen to be a bad
thing in commit 9c0f2f2c. Use of erlang:now/0 is now removed.
Diffstat (limited to 'lib/diameter/test/diameter_examples_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_examples_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diameter/test/diameter_examples_SUITE.erl b/lib/diameter/test/diameter_examples_SUITE.erl index 2c10daec50..e4ed2b227d 100644 --- a/lib/diameter/test/diameter_examples_SUITE.erl +++ b/lib/diameter/test/diameter_examples_SUITE.erl @@ -299,7 +299,7 @@ slave(_) -> T0 = diameter_lib:now(), {ok, Node} = ct_slave:start(?MODULE, ?TIMEOUTS), T1 = diameter_lib:now(), - T2 = rpc:call(Node, erlang, now, []), + T2 = rpc:call(Node, diameter_lib, now, []), {ok, Node} = ct_slave:stop(?MODULE), now_diff([T0, T1, T2, diameter_lib:now()]). |