diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-02-17 12:30:41 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-02-17 12:30:41 +0100 |
| commit | 25e7a4c60dd15e6f2fedfcf6df267efd7ee80db8 (patch) | |
| tree | cd2d1b8506ebc43ad5517247473a9d2cecf2f475 /lib | |
| parent | ef8b1e3e8c908379cec8376ed515c920682224f9 (diff) | |
| parent | 71a9e62710083023c457fb56e7a1c2d9852baaee (diff) | |
| download | otp-25e7a4c60dd15e6f2fedfcf6df267efd7ee80db8.tar.gz otp-25e7a4c60dd15e6f2fedfcf6df267efd7ee80db8.tar.bz2 otp-25e7a4c60dd15e6f2fedfcf6df267efd7ee80db8.zip | |
Merge branch 'ia/ssl/os-timestamp' into maint
* ia/ssl/os-timestamp:
ssl: erlang:timestamp -> os:timestamp Complements commit 450773958165539951cd431a9233ce7666ec20e2
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/ssl_pem_cache_SUITE.erl | 2 |
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)). |