diff options
| author | Rickard Green <[email protected]> | 2016-02-02 10:17:05 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-02-02 10:17:05 +0100 |
| commit | 178cff0a09223da707ca8472a71dbe4125466493 (patch) | |
| tree | df849d4a871940a13ae53e28e6de25a030f54ffb /erts/emulator/beam/atom.names | |
| parent | 5dac3400b00e499cb7c436b6b71c510c718d92cf (diff) | |
| parent | 3f33428db9aea0d767295322c4e882a5c6bbf7db (diff) | |
| download | otp-178cff0a09223da707ca8472a71dbe4125466493.tar.gz otp-178cff0a09223da707ca8472a71dbe4125466493.tar.bz2 otp-178cff0a09223da707ca8472a71dbe4125466493.zip | |
Merge branch 'rickard/monotonic-time-improvements/OTP-13222' into maint
* rickard/monotonic-time-improvements/OTP-13222:
Introduce time management in native APIs
Introduce time warp safe replacement for safe_fixed option
Introduce time warp safe trace timestamp formats
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index fb3368eae2..07f6492948 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -370,6 +370,7 @@ atom monitor atom monitor_nodes atom monitors atom monotonic +atom monotonic_timestamp atom more atom multi_scheduling atom multiline @@ -559,6 +560,7 @@ atom static atom stderr_to_stdout atom stop atom stream +atom strict_monotonic_timestamp atom sunrm atom suspend atom suspended |