summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bjorn/compiler/opt-binary-strings/OTP-14125'Björn Gustavsson2017-02-271-7/+24
|\
| * v3_core: Combine binary strings to larger integersBjörn Gustavsson2017-02-271-7/+24
* | Merge branch 'egil/pretty-print-maps-smaller/OTP-14239'Björn-Egil Dahlberg2017-02-271-11/+1
|\ \
| * | stdlib: Use erts_internal:maps_to_list/2 in io_lib_prettyBjörn-Egil Dahlberg2017-02-231-11/+1
* | | Merge pull request PR-1348 OTP-14238 from margnus1/drop-old-llvmSverker Eriksson2017-02-242-32/+12
|\ \ \ | |_|/ |/| |
| * | ErLLVM: Drop code printing assembly for LLVM < 3.9Magnus Lång2017-02-191-30/+10
| * | ErLLVM: Demand LLVM 3.9 or greaterMagnus Lång2017-02-191-2/+2
* | | Merge branch 'maint'Björn Gustavsson2017-02-243-2/+131
|\ \ \
| * \ \ Merge pull request #1350 from bjorng/bjorn/stdlib/safe-relative-path/OTP-14215Björn Gustavsson2017-02-243-2/+130
| |\ \ \
| | * | | filename: Add safe_relative_path/1Björn Gustavsson2017-02-213-2/+130
* | | | | Merge branch 'bjorn/stdlib/misc-fixes'Björn Gustavsson2017-02-241-2/+4
|\ \ \ \ \
| * | | | | c: Reintroduce support for non-list options in c/2Björn Gustavsson2017-02-221-1/+3
| * | | | | c: Remove unused import of lists:concat/1Björn Gustavsson2017-02-221-1/+1
* | | | | | Merge branch 'hasse/stdlib/sofs_opt/OTP-14157'Hans Bolinder2017-02-232-202/+164
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | stdlib: Simplify error handling of the sofs moduleHans Bolinder2017-02-222-202/+164
* | | | | | Merge branch 'maint'Ingela Anderton Andin2017-02-221-9/+9
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'ingela/ssl/default-ciphers-suites/OTP-14235' into maintIngela Anderton Andin2017-02-221-9/+9
| |\ \ \ \ \
| | * | | | | ssl: Always prefer AES over 3DESIngela Anderton Andin2017-02-211-9/+9
* | | | | | | Merge branch 'maint'Lukas Larsson2017-02-221-9/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'lukas/kernel/fix_os_cmd_close_race/OTP-14232' into maintLukas Larsson2017-02-221-9/+15
| |\ \ \ \ \
| | * | | | | kernel: Fix hanging os:cmd race conditionLukas Larsson2017-02-211-9/+15
* | | | | | | Merge branch 'maint'Lukas Larsson2017-02-222-21/+44
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'lukas/kernel/fail-sticky_dir-if-not-sticky' into maintLukas Larsson2017-02-221-14/+22
| |\ \ \ \ \ \
| | * | | | | | kernel: Fail sticky_dir tc if module not stickyLukas Larsson2017-02-201-14/+22
| * | | | | | | Merge pull request #1351 from stevendanna/ssl_session_cache_api_size_docsIngela Andin2017-02-221-7/+22
| |\ \ \ \ \ \ \
| | * | | | | | | Document ssl_session_cache_api's size/1 callbackSteven Danna2017-02-211-7/+22
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge branch 'maint'Hans Bolinder2017-02-2212-159/+763
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'hasse/stdlib/fix_pretty_maps/OTP-14175' into maintHans Bolinder2017-02-222-35/+337
| |\ \ \ \ \ \ \
| | * | | | | | | stdlib: Improve pretty-printing of terms with mapsHans Bolinder2017-02-212-35/+337
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'lars/xmerl/sax-parser-multi-doc-problem' into maintLars Thorsen2017-02-2210-124/+426
| |\ \ \ \ \ \ \
| | * | | | | | | [xmerl] Remove faulty throwsLars Thorsen2017-02-222-5/+5
| | * | | | | | | [xmerl] Fix XML "well-formedness" bug i SAX parserLars Thorsen2017-02-223-79/+46
| | * | | | | | | [xmerl] Correct bug handling multiple documents on a streamLars Thorsen2017-02-228-41/+376
* | | | | | | | | Merge branch 'maint'Siri Hansen2017-02-225-6/+192
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge branch 'siri/ct/get_dirs_from_testspec/OTP-14132' into maintSiri Hansen2017-02-225-6/+192
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | [ct] Add ct_testspec:get_tests/1Siri Hansen2017-01-115-6/+192
* | | | | | | | Merge branch 'maint'Björn-Egil Dahlberg2017-02-211-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'legoscia/erl_interface/doc-no-tuple-funs/PR-1343/OTP-14233' int...Björn-Egil Dahlberg2017-02-211-1/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Documentation: tuple funs are unsupportedMagnus Henoch2017-02-151-1/+1
* | | | | | | | dialyzer: Correct test cases after removal of erlang:hash/2Hans Bolinder2017-02-212-0/+3
* | | | | | | | Merge branch 'maint'Hans Nilsson2017-02-201-6/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'hans/ssh/iolist_on_unicode/ERL-364/OTP-14230' into maintHans Nilsson2017-02-201-6/+12
| |\ \ \ \ \ \ \
| | * | | | | | | ssh: replace byte-only function with element-size agnosticHans Nilsson2017-02-171-6/+12
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge branch 'maint'Hans Nilsson2017-02-201-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'hans/ssh/cuddle_tests' into maintHans Nilsson2017-02-201-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | ssh: increase timetrap in ssh_to_openssh_SUITE to not interrupt some slow mac...Hans Nilsson2017-02-171-1/+1
| | |/ / / / / /
* | | | | | | | Merge branch 'maint'Hans Nilsson2017-02-202-30/+186
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge branch 'ssh_sftpd_relative_path' into hans/ssh/sftpd_fixes/OTP-14225Hans Nilsson2017-02-172-15/+74
| |\ \ \ \ \ \
| | * | | | | | Return correct state in the case of failureKarolis Petrauskas2017-02-151-6/+7
| | * | | | | | Check for directory with correct pathKarolis Petrauskas2017-02-122-3/+46
View Lorry Controller Status