diff options
| author | Rickard Green <[email protected]> | 2016-08-30 16:25:00 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-30 16:25:00 +0200 |
| commit | 925984e94f2c1933bb659dfb626c191982b7c8d4 (patch) | |
| tree | d1c5bec6861970d2c7e0d8090d39d8e77c2d4616 /erts/emulator/beam/atom.names | |
| parent | d419ca5917d4d27afe0518e5e5c444af5b11f480 (diff) | |
| parent | fc85e401ee279cc3b69635a71ffa93544ce5b99d (diff) | |
| download | otp-925984e94f2c1933bb659dfb626c191982b7c8d4.tar.gz otp-925984e94f2c1933bb659dfb626c191982b7c8d4.tar.bz2 otp-925984e94f2c1933bb659dfb626c191982b7c8d4.zip | |
Merge branch 'rickard/time-unit/OTP-13735' into maint
* rickard/time-unit/OTP-13735:
Update test-cases to use new symbolic time units
Replace misspelled symbolic time units
Conflicts:
erts/doc/src/erlang.xml
erts/emulator/test/long_timers_test.erl
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index 89c42f4700..9dae67cb2d 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -389,8 +389,10 @@ atom merge_trap atom meta atom meta_match_spec atom micro_seconds +atom microsecond atom microstate_accounting atom milli_seconds +atom millisecond atom min_heap_size atom min_bin_vheap_size atom minor_version @@ -407,6 +409,7 @@ atom more atom multi_scheduling atom multiline atom nano_seconds +atom nanosecond atom name atom named_table atom namelist @@ -562,6 +565,7 @@ atom schedulers_online atom scheme atom scientific atom scope +atom second atom seconds atom send_to_non_existing_process atom sensitive |