aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-02-17 12:31:22 +0100
committerIngela Anderton Andin <[email protected]>2015-02-17 12:31:22 +0100
commitd26260a1d731be4fc37efbd9161e8e58489733bf (patch)
tree3423842f08e61fad1e7a444783b5353ba1f3ec50
parent48a19297ab6b0e16c5e490033477b937301947b2 (diff)
parent25e7a4c60dd15e6f2fedfcf6df267efd7ee80db8 (diff)
downloadotp-d26260a1d731be4fc37efbd9161e8e58489733bf.tar.gz
otp-d26260a1d731be4fc37efbd9161e8e58489733bf.tar.bz2
otp-d26260a1d731be4fc37efbd9161e8e58489733bf.zip
Merge branch 'maint'
-rw-r--r--lib/ssl/test/ssl_pem_cache_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_pem_cache_SUITE.erl b/lib/ssl/test/ssl_pem_cache_SUITE.erl
index 36c2a17a50..843079e2fe 100644
--- a/lib/ssl/test/ssl_pem_cache_SUITE.erl
+++ b/lib/ssl/test/ssl_pem_cache_SUITE.erl
@@ -121,7 +121,7 @@ get_pem_cache() ->
end.
later()->
- DateTime = calendar:now_to_local_time(erlang:timestamp()),
+ DateTime = calendar:now_to_local_time(os:timestamp()),
Gregorian = calendar:datetime_to_gregorian_seconds(DateTime),
calendar:gregorian_seconds_to_datetime(Gregorian + (2 * ?CLEANUP_INTERVAL)).