diff options
| author | Björn Gustavsson <[email protected]> | 2016-10-05 15:06:09 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-10-05 15:06:09 +0200 |
| commit | 7af3910bb06433f7c9182db11d853823f202c2b6 (patch) | |
| tree | 5fd0b1fe04e670123f9b31381e195ed5ce55d1cf /bootstrap/lib/kernel | |
| parent | ef6f8da5d027055a36c70196df69dfbb7b464800 (diff) | |
| parent | 497330a828089b465ac026551edf33fb947ae2f6 (diff) | |
| download | otp-7af3910bb06433f7c9182db11d853823f202c2b6.tar.gz otp-7af3910bb06433f7c9182db11d853823f202c2b6.tar.bz2 otp-7af3910bb06433f7c9182db11d853823f202c2b6.zip | |
Merge branch 'maint'
* maint:
Update primary bootstrap
beam_block: Avoid unsafe inclusion of get_map_elements in blocks
Diffstat (limited to 'bootstrap/lib/kernel')
| -rw-r--r-- | bootstrap/lib/kernel/ebin/inet_db.beam | bin | 27024 -> 27020 bytes | |||
| -rw-r--r-- | bootstrap/lib/kernel/ebin/kernel.app | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap/lib/kernel/ebin/inet_db.beam b/bootstrap/lib/kernel/ebin/inet_db.beam Binary files differindex fcdc51793f..c778948935 100644 --- a/bootstrap/lib/kernel/ebin/inet_db.beam +++ b/bootstrap/lib/kernel/ebin/inet_db.beam diff --git a/bootstrap/lib/kernel/ebin/kernel.app b/bootstrap/lib/kernel/ebin/kernel.app index 569e0fb5b1..60bb6e06ee 100644 --- a/bootstrap/lib/kernel/ebin/kernel.app +++ b/bootstrap/lib/kernel/ebin/kernel.app @@ -118,6 +118,6 @@ {applications, []}, {env, [{error_logger, tty}]}, {mod, {kernel, []}}, - {runtime_dependencies, ["erts-8.0", "stdlib-3.0", "sasl-3.0"]} + {runtime_dependencies, ["erts-9.0", "stdlib-3.0", "sasl-3.0"]} ] }. |