diff options
| author | Anders Svensson <[email protected]> | 2015-03-05 01:34:41 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-05 01:34:41 +0100 |
| commit | ac82610a03c8b17b6bcae91aa4252a1930c51e85 (patch) | |
| tree | 23c9bd58e6792ed656af6889cafbda8805377b55 /lib/diameter/src/base/diameter_peer.erl | |
| parent | 2456cf80733d3ee5d1c0dca3c52366166d8ad2b6 (diff) | |
| parent | 71b52f31772210a7160317966ca46e36140b935a (diff) | |
| download | otp-ac82610a03c8b17b6bcae91aa4252a1930c51e85.tar.gz otp-ac82610a03c8b17b6bcae91aa4252a1930c51e85.tar.bz2 otp-ac82610a03c8b17b6bcae91aa4252a1930c51e85.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src/base/diameter_peer.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_peer.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter_peer.erl b/lib/diameter/src/base/diameter_peer.erl index e5d4b28766..ea326dd03e 100644 --- a/lib/diameter/src/base/diameter_peer.erl +++ b/lib/diameter/src/base/diameter_peer.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2013. All Rights Reserved. +%% Copyright Ericsson AB 2010-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -18,9 +18,11 @@ %% -module(diameter_peer). - -behaviour(gen_server). +-compile({no_auto_import, [now/0]}). +-import(diameter_lib, [now/0]). + %% Interface towards transport modules ... -export([recv/2, up/1, |