diff options
| author | Anders Svensson <[email protected]> | 2015-03-05 01:34:08 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-05 01:34:08 +0100 |
| commit | 5e5b22215e3f0a60b7afc2393b3ef68892360b07 (patch) | |
| tree | 1c0a2c3b66c6af9eae4ba6587b911681a075ae64 /lib/diameter/src/base/diameter_config.erl | |
| parent | a4df8f2e68ccef9936c5b43378a006099d81f801 (diff) | |
| parent | eae8ecd1fd2ba33b1c81d0c19605047e2f317eda (diff) | |
| download | otp-5e5b22215e3f0a60b7afc2393b3ef68892360b07.tar.gz otp-5e5b22215e3f0a60b7afc2393b3ef68892360b07.tar.bz2 otp-5e5b22215e3f0a60b7afc2393b3ef68892360b07.zip | |
Merge branch 'anders/diameter/time/OTP-12439' into maint
* anders/diameter/time/OTP-12439:
Use new time api in test suites
Use new time api in implementation
Diffstat (limited to 'lib/diameter/src/base/diameter_config.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_config.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl index 270faa9542..c0a4f7df69 100644 --- a/lib/diameter/src/base/diameter_config.erl +++ b/lib/diameter/src/base/diameter_config.erl @@ -35,10 +35,11 @@ %% -module(diameter_config). --compile({no_auto_import, [monitor/2]}). - -behaviour(gen_server). +-compile({no_auto_import, [monitor/2, now/0]}). +-import(diameter_lib, [now/0]). + -export([start_service/2, stop_service/1, add_transport/2, |