diff options
| author | Henrik Nord <[email protected]> | 2019-03-12 12:42:50 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2019-03-12 12:42:50 +0100 |
| commit | 1518224b7f955dfb8cdef04eac89d8f6df1694a1 (patch) | |
| tree | 5b22a2d5896802c4fdb9be1a744a1d355cfd2686 /lib/kernel/src | |
| parent | 0ffc8346553a5fc9322a75d4d8be5417dad67f29 (diff) | |
| parent | 620ac3e68c5bc8b36143965fcf2892a07dc005c4 (diff) | |
| download | otp-1518224b7f955dfb8cdef04eac89d8f6df1694a1.tar.gz otp-1518224b7f955dfb8cdef04eac89d8f6df1694a1.tar.bz2 otp-1518224b7f955dfb8cdef04eac89d8f6df1694a1.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/kernel.appup.src | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src index 66fbcbf78d..8fa3f5c588 100644 --- a/lib/kernel/src/kernel.appup.src +++ b/lib/kernel/src/kernel.appup.src @@ -42,7 +42,8 @@ {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^6\\.2$">>,[restart_new_emulator]}, - {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}], + {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^6\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}], [{<<"^5\\.3$">>,[restart_new_emulator]}, {<<"^5\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^5\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, @@ -58,4 +59,5 @@ {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}, {<<"^6\\.2$">>,[restart_new_emulator]}, - {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}. + {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}, + {<<"^6\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}. |