aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-04-20Merge branch 'lukas/erts/erlexec_docker_cpuset-cpus/OTP-14352'Lukas Larsson
* lukas/erts/erlexec_docker_cpuset-cpus/OTP-14352: erts: Fix erlexec to handle mismatch in sysconf and proc fs
2017-04-20erts: Fix erlexec to handle mismatch in sysconf and proc fsLukas Larsson
This behaviour has been seen when using docker together with --cpuset-cpus.
2017-04-19Merge pull request #1409 from margnus1/hipe-m32-build2Sverker Eriksson
HiPE: Fix --enable-native-libs --enable-m32-build
2017-04-19Merge branch 'sverker/remove-latin1-atom-encoding'Sverker Eriksson
AGAIN * sverker/remove-latin1-atom-encoding: tools: Fix more assumptions in lcnt about external format
2017-04-19Merge branch 'bjorn/stdlib/erl_tar/OTP-14278'Björn Gustavsson
* bjorn/stdlib/erl_tar/OTP-14278: erl_tar: Handle leading slashes and directory traversal attacks Don't create absolute path names in tar files
2017-04-18tools: Fix more assumptions in lcnt about external formatSverker Eriksson
Also tried to prepare for large creation.
2017-04-18Merge pull request #1412 from manuel-rubio/manuel-rubio/add-re-versionRickard Green
Add re:version/0 OTP-14347
2017-04-18HiPE: Fix --enable-native-libs --enable-m32-buildMagnus Lång
This fixes a mistake in 6d8c39229 where a few "enable_hipe=no" that makes the build fail when building with both --enable-native-libs and --enable-m32-build slipped through.
2017-04-18Merge branch 'hans/ssh/dialyzer_fixes'Hans Nilsson
2017-04-18ssh: fix dialyzer errorsHans Nilsson
2017-04-18Merge branch 'hasse/stdlib/linter_check_dialyzer/OTP-14323'Hans Bolinder
* hasse/stdlib/linter_check_dialyzer/OTP-14323: stdlib: Add checks of the dialyzer attribute to the linter
2017-04-17test for re:version/0Manuel Rubio
2017-04-17add re:version/0 documentation and update the copyright of the file to 2017Manuel Rubio
2017-04-13Merge branch 'hans/ssh/crypt_rand_uniform'Hans Nilsson
2017-04-13Merge branch 'hans/ssh/use_postpone'Hans Nilsson
2017-04-13Merge branch 'hans/ssh/rename_to_init'Hans Nilsson
2017-04-13ssh: re-write to use callback init/1Hans Nilsson
2017-04-13erl_tar: Handle leading slashes and directory traversal attacksBjörn Gustavsson
2017-04-13stdlib: Add checks of the dialyzer attribute to the linterHans Bolinder
The same checks are also performed by the Dialyzer.
2017-04-13Merge branch 'ingela/dtls/progress'Ingela Anderton Andin
* ingela/dtls/progress: dtls: Correct cookie map name dtls: Fix active once emulation for DTLS
2017-04-13dtls: Correct cookie map nameIngela Anderton Andin
2017-04-13dtls: Fix active once emulation for DTLSIngela Anderton Andin
2017-04-13Merge branch 'siri/make/include-path/ERL-395/OTP-14339'Siri Hansen
* siri/make/include-path/ERL-395/OTP-14339: [tools/make] Add current directory to include path
2017-04-12ssh: replace deprecated crypto:rand_uniformHans Nilsson
2017-04-12Merge branch sverker/remove-latin1-atom-encoding/OTP-14337Sverker Eriksson
* sverker/remove-latin1-atom-encoding: kernel: Fix erl_distribution_wb_SUITE:whitebox kernel: Remove pg2_SUITE:compat erts: Remove fun_r13_SUITE stdlib: Remove test cases for R12 io protocol kernel: Make DFLAG_UTF8_ATOMS mandatory kernel: Rewrite distribution flag verification tools: Update assumptions in lcnt about external atom format stdlib: Tweak beam_lib_SUITE whitebox assumptions orber: Remove hard dependency to external atom format kernel: Try mend disk_log whitebox tests erts: Mark latin1 atom encoding as deprecated jinterface: Do not generate atoms on old latin1 external format erl_interface: Do not generate atoms on old latin1 ext format erts: Do not generate atoms on old latin1 external format erts: Fix faulty ASSERT for failed dec_term
2017-04-12ssh: change next_event to postponeHans Nilsson
2017-04-12Merge branch 'ingela/openssl-version'Ingela Anderton Andin
* ingela/openssl-version: crypto: Update documentation to reflect new version policy erts: Update configure check for OpenSSL
2017-04-12Don't create absolute path names in tar filesBjörn Gustavsson
We should not assume that erl_tar will allow unpacking tar files with absolute path names for archive members.
2017-04-12[tools/make] Add current directory to include pathSiri Hansen
This is to ensure that files are recompiled if a .hrl file in the current directory is changed.
2017-04-12Merge branch 'bjorn/compiler/unicode-atoms/OTP-14285'Björn Gustavsson
* bjorn/compiler/unicode-atoms/OTP-14285: Correct compile_SUITE:core_roundtrip/1 Atoms in Core Erlang must be encoded in UTF-8
2017-04-12Merge branch 'hans/ssh/message_queue_data_off_heap'Hans Nilsson
2017-04-12ssh: added message_queue_data,off_heap to spawnHans Nilsson
Seems to solve some test case problems when heavily loaded
2017-04-12Correct compile_SUITE:core_roundtrip/1Björn Gustavsson
The test is supposed to compare the Core Erlang code that has been printed and parsed back. It did compare and print any differences, but it did not fail when there were differences. Also fix problems with variable names and maps not comparing equal when the inliner has been used.
2017-04-12Atoms in Core Erlang must be encoded in UTF-8Björn Gustavsson
core_scan will now support and require atoms encoded in UTF-8.
2017-04-12Merge branch 'hans/crypto/cuddle_tests'Hans Nilsson
2017-04-12crypto: Increase prime to pass with FIPS-enabled cryptolibHans Nilsson
Fix for problem introduced with OTP-14140
2017-04-12Merge branch 'rickard/ds-fixes'Rickard Green
* rickard/ds-fixes: Fix dirty GC implementation Fix multi-scheduling with only one normal scheduler Fix +SDPcpu
2017-04-12Merge branch 'siri/ct/scale-on-valgrind'Siri Hansen
* siri/ct/scale-on-valgrind: [ct] Scale timetraps when running valgrind
2017-04-12[ct] Scale timetraps when running valgrindSiri Hansen
2017-04-12Merge branch 'ingela/ssl/ECC-combos/OTP-14334'Ingela Anderton Andin
* ingela/ssl/ECC-combos/OTP-14334: ssl: Generate correct certificate chains for the ECC tests public_key: Public RSA key is present in private key
2017-04-12ssl: Generate correct certificate chains for the ECC testsIngela Anderton Andin
The certificate chain handling had become quite entangled and was not correct.
2017-04-12public_key: Public RSA key is present in private keyIngela Anderton Andin
Change the return value from {#'RSAPublicKey'{}, #'RSAPrivateKey'{}} to #'RSAPrivateKey'{} This conforms to the #'ECPrivateKey'{} return value. Note that DH key will be returned as {Public::integer(), Private::integer()} as there is no key structure (record) only two integers. Maybe we would like to add extraction functions for the public key from the private ones later.
2017-04-11Merge branch 'rickard/node_container_SUITE.spec'Rickard Green
* rickard/node_container_SUITE.spec: Add node_container_SUITE spec
2017-04-11Merge branch 'rickard/pd-hash'Rickard Green
* rickard/pd-hash: Fix type of MAKE_HASH
2017-04-11Merge branch 'rickard/test-fix'Rickard Green
* rickard/test-fix: Fix scheduler_SUITE:update_cpu_info test-case
2017-04-11Merge branch 'rickard/sched_type_tests'Rickard Green
* rickard/sched_type_tests: Fix dirty scheduler type tests
2017-04-11Fix dirty GC implementationRickard Green
2017-04-11Fix multi-scheduling with only one normal schedulerRickard Green
2017-04-11Fix +SDPcpuRickard Green
2017-04-11Merge branch 'rickard/pcre-8.40'Rickard Green
OTP-14331 * rickard/pcre-8.40: Update documentation Update README.pcre_update.md Stack guard for PCRE Adjust for incompatibility between PCRE 8.40 and perl 5.22.1 Generate re replacement and split tests with perl vsn 5.22.1 Fix re_SUITE:pcre_compile_workspace_overflow/1 Skip line with lockout of modifiers in PCRE tests Update tests for PCRE version 8.40 Update PCRE to version 8.40 Conflicts: erts/emulator/beam/beam_debug.c