diff options
| author | Rickard Green <[email protected]> | 2017-10-12 17:05:02 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-10-12 17:05:02 +0200 |
| commit | 5dc3cc971a7ce8d5384019a9a6f14a9ab7790163 (patch) | |
| tree | b7e4befb7b193bdbf466a58e9de379edad5cdbf1 /lib/kernel/src/kernel.app.src | |
| parent | 35d9fcedf1cc450ca36d95e9b8263fbc3e3a9b57 (diff) | |
| parent | bb0b43eae854125688f3143e53c8974cafed4ad2 (diff) | |
| download | otp-5dc3cc971a7ce8d5384019a9a6f14a9ab7790163.tar.gz otp-5dc3cc971a7ce8d5384019a9a6f14a9ab7790163.tar.bz2 otp-5dc3cc971a7ce8d5384019a9a6f14a9ab7790163.zip | |
Merge branch 'rickard/null-chars/ERL-370/OTP-14543'
* rickard/null-chars/ERL-370/OTP-14543:
Don't allow null chars in various strings
Conflicts:
erts/emulator/beam/erl_alloc.types
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'lib/kernel/src/kernel.app.src')
| -rw-r--r-- | lib/kernel/src/kernel.app.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src index 2a88cc7e26..080b11fc4d 100644 --- a/lib/kernel/src/kernel.app.src +++ b/lib/kernel/src/kernel.app.src @@ -120,6 +120,6 @@ {applications, []}, {env, [{error_logger, tty}]}, {mod, {kernel, []}}, - {runtime_dependencies, ["erts-9.1", "stdlib-3.4", "sasl-3.0"]} + {runtime_dependencies, ["erts-10.0", "stdlib-3.5", "sasl-3.0"]} ] }. |