diff options
| author | Erland Schönbeck <[email protected]> | 2015-03-25 12:42:53 +0100 |
|---|---|---|
| committer | Erland Schönbeck <[email protected]> | 2015-03-25 12:42:53 +0100 |
| commit | a206e66f13471cdad02a966fcb569673e0938fa4 (patch) | |
| tree | c712ca2b96a2fb1742c6598627f2bc349e2a5c8f /lib/ssh/src | |
| parent | 1f3869b308af19fb9cf471a12b8a1fdeab9da290 (diff) | |
| parent | 0fd30aa5c434dab38d0aa39a3ab7899c7e89dd9d (diff) | |
| download | otp-a206e66f13471cdad02a966fcb569673e0938fa4.tar.gz otp-a206e66f13471cdad02a966fcb569673e0938fa4.tar.bz2 otp-a206e66f13471cdad02a966fcb569673e0938fa4.zip | |
Merge branch 'erland/ssh/OTP18/time_api/OTP-12444'
* erland/ssh/OTP18/time_api/OTP-12444:
ssh: Use new time API
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh_info.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_info.erl b/lib/ssh/src/ssh_info.erl index 9a91875894..eae9ded5c6 100644 --- a/lib/ssh/src/ssh_info.erl +++ b/lib/ssh/src/ssh_info.erl @@ -179,7 +179,7 @@ line(Len, Char) -> datetime() -> - {{YYYY,MM,DD}, {H,M,S}} = calendar:now_to_universal_time(now()), + {{YYYY,MM,DD}, {H,M,S}} = calendar:now_to_universal_time(erlang:timestamp()), lists:flatten(io_lib:format('~4w-~2..0w-~2..0w ~2..0w:~2..0w:~2..0w UTC',[YYYY,MM,DD, H,M,S])). |