aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap/lib/stdlib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-10-05 15:06:09 +0200
committerBjörn Gustavsson <[email protected]>2016-10-05 15:06:09 +0200
commit7af3910bb06433f7c9182db11d853823f202c2b6 (patch)
tree5fd0b1fe04e670123f9b31381e195ed5ce55d1cf /bootstrap/lib/stdlib
parentef6f8da5d027055a36c70196df69dfbb7b464800 (diff)
parent497330a828089b465ac026551edf33fb947ae2f6 (diff)
downloadotp-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/stdlib')
-rw-r--r--bootstrap/lib/stdlib/ebin/dets.beambin53688 -> 53684 bytes
-rw-r--r--bootstrap/lib/stdlib/ebin/error_logger_file_h.beambin4656 -> 4684 bytes
-rw-r--r--bootstrap/lib/stdlib/ebin/error_logger_tty_h.beambin4936 -> 4968 bytes
-rw-r--r--bootstrap/lib/stdlib/ebin/stdlib.app2
-rw-r--r--bootstrap/lib/stdlib/ebin/supervisor.beambin23684 -> 23696 bytes
-rw-r--r--bootstrap/lib/stdlib/ebin/timer.beambin5476 -> 5472 bytes
6 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap/lib/stdlib/ebin/dets.beam b/bootstrap/lib/stdlib/ebin/dets.beam
index 8dbca8b913..a563317049 100644
--- a/bootstrap/lib/stdlib/ebin/dets.beam
+++ b/bootstrap/lib/stdlib/ebin/dets.beam
Binary files differ
diff --git a/bootstrap/lib/stdlib/ebin/error_logger_file_h.beam b/bootstrap/lib/stdlib/ebin/error_logger_file_h.beam
index 0e61e87708..b845a64248 100644
--- a/bootstrap/lib/stdlib/ebin/error_logger_file_h.beam
+++ b/bootstrap/lib/stdlib/ebin/error_logger_file_h.beam
Binary files differ
diff --git a/bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam b/bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam
index 46eafce18e..af784cf79d 100644
--- a/bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam
+++ b/bootstrap/lib/stdlib/ebin/error_logger_tty_h.beam
Binary files differ
diff --git a/bootstrap/lib/stdlib/ebin/stdlib.app b/bootstrap/lib/stdlib/ebin/stdlib.app
index 3172169b30..0ac85cef0c 100644
--- a/bootstrap/lib/stdlib/ebin/stdlib.app
+++ b/bootstrap/lib/stdlib/ebin/stdlib.app
@@ -106,7 +106,7 @@
dets]},
{applications, [kernel]},
{env, []},
- {runtime_dependencies, ["sasl-3.0","kernel-5.0","erts-8.0","crypto-3.3",
+ {runtime_dependencies, ["sasl-3.0","kernel-5.0","erts-9.0","crypto-3.3",
"compiler-5.0"]}
]}.
diff --git a/bootstrap/lib/stdlib/ebin/supervisor.beam b/bootstrap/lib/stdlib/ebin/supervisor.beam
index 581fcf1019..a05ae66941 100644
--- a/bootstrap/lib/stdlib/ebin/supervisor.beam
+++ b/bootstrap/lib/stdlib/ebin/supervisor.beam
Binary files differ
diff --git a/bootstrap/lib/stdlib/ebin/timer.beam b/bootstrap/lib/stdlib/ebin/timer.beam
index 8d8fcf8937..e23790c427 100644
--- a/bootstrap/lib/stdlib/ebin/timer.beam
+++ b/bootstrap/lib/stdlib/ebin/timer.beam
Binary files differ