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/src/transport | |
| 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/src/transport')
| -rw-r--r-- | lib/diameter/src/transport/diameter_sctp.erl | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl index 3e08b78ea1..678dc9b5d6 100644 --- a/lib/diameter/src/transport/diameter_sctp.erl +++ b/lib/diameter/src/transport/diameter_sctp.erl @@ -21,9 +21,6 @@ -module(diameter_sctp). -behaviour(gen_server). --compile({no_auto_import, [now/0]}). --import(diameter_lib, [now/0]). - %% interface -export([start/3]). |