summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix typo error from recent mergeDmitriy Kargapolov2015-01-311-1/+1
* Merge branch 'mikpe/hipe-code-alloc-fixes'Marcus Arendt2015-01-3014-76/+50
|\
| * hipe: improve error handling at code allocation failureMikael Pettersson2015-01-266-23/+48
| * hipe: remove two obsolete BIFsMikael Pettersson2015-01-264-30/+0
| * hipe: remove HIPE_ALLOC_CODE macroMikael Pettersson2015-01-266-23/+2
* | Merge branch 'maint'Bruce Yinhe2015-01-291-1/+1
|\ \
| * \ Merge branch '0xAX/inets-typo-fix' into maintBruce Yinhe2015-01-291-1/+1
| |\ \
| | * | lib/inets: fix typo in httpd_load_test example0xAX2015-01-241-1/+1
* | | | Update primary bootstrapBjörn Gustavsson2015-01-2916-0/+0
* | | | Merge branch 'bjorn/compiler/map-fixes'Björn Gustavsson2015-01-2914-237/+352
|\ \ \ \
| * | | | cerl: Remove a clause in fold_map_pairs/3 that will never be reachedBjörn Gustavsson2015-01-291-3/+1
| * | | | Move grouping of map constructions from v3_core to v3_kernelBjörn Gustavsson2015-01-292-99/+82
| * | | | core_pp: Correct printing of map literalsBjörn Gustavsson2015-01-283-14/+14
| * | | | Strengthen and modernize compile_SUITEBjörn Gustavsson2015-01-271-24/+47
| * | | | core_parse: Always fold literal consesBjörn Gustavsson2015-01-272-12/+4
| * | | | cerl: Make sure that we preserve the invariants for mapsBjörn Gustavsson2015-01-264-17/+78
| * | | | cerl_clauses: Fix indentationBjörn Gustavsson2015-01-261-23/+23
| * | | | sys_core_fold: Strengthen optimization of letrecs in effect contextBjörn Gustavsson2015-01-262-3/+20
| * | | | Fix handling of binary map keys in comprehensionsBjörn Gustavsson2015-01-261-7/+11
| * | | | core_lib: Teach is_var_used/2 to handle keys in map patternsBjörn Gustavsson2015-01-262-6/+25
| * | | | warnings_SUITE: Eliminate compiler warning for a shadowed variableBjörn Gustavsson2015-01-261-3/+3
| * | | | lc_SUITE: Add shadow/1Björn Gustavsson2015-01-261-2/+15
| * | | | Modernize lc_SUITEBjörn Gustavsson2015-01-261-27/+32
* | | | | Merge branch 'bjorn/compiler/coverage'Björn Gustavsson2015-01-2913-27/+26
|\ \ \ \ \
| * | | | | sys_core_fold: Remove uncovered clauses matching #c_map{}Björn Gustavsson2015-01-281-2/+0
| * | | | | beam_z: Remove the uncovered to_typed_literal/1 functionBjörn Gustavsson2015-01-261-11/+3
| * | | | | Speed up running of compiler test suites in coverage modeBjörn Gustavsson2015-01-2611-14/+23
| | |_|_|/ | |/| | |
* | | | | Merge branch 'maint'Marcus Arendt2015-01-270-0/+0
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge branch 'maint-r16' into maintMarcus Arendt2015-01-270-0/+0
| |\ \ \
| | * | | Prepare releaseErlang/OTP2015-01-262-1/+20
| | * | | Merge branch 'sverk/port_get_data-race-r16b03/OTP-12208' into maint-r16Erlang/OTP2015-01-263-7/+74
| | |\ \ \
| | | * | | erts: Fix port data memory allocation bugSverker Eriksson2015-01-212-11/+17
| | | * | | erts: Mend port_set_data with non-immed data for halfword VMSverker Eriksson2015-01-211-1/+2
| | | * | | erts: Add test case for port_set_data and port_get_dataSverker Eriksson2015-01-211-0/+51
| | | * | | erts: Fix race between port_set_data, port_get_data and port terminationSverker Eriksson2015-01-211-3/+11
| | | * | | erts: Fix erlang:port_set_data/2 for non immediate dataSverker Eriksson2015-01-211-0/+1
| | * | | | Merge branch 'marcus/16/fix-rebuild' into maint-r16Erlang/OTP2015-01-261-1/+1
| | |\ \ \ \
| | | * | | | Sort keys before generatingLukas Larsson2014-11-281-1/+1
| | |/ / / /
* | | | | | Merge branch 'vladdu/edoc_remove_packages/OTP-12431'Marcus Arendt2015-01-2623-563/+184
|\ \ \ \ \ \
| * | | | | | [edoc] remove functionality related to packagesVlad Dumitrescu2015-01-1620-563/+165
| * | | | | | [edoc] add test for nested source directoriesVlad Dumitrescu2015-01-164-2/+21
* | | | | | | Merge branch 'maint'Marcus Arendt2015-01-262-2/+36
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch 's1n4/httpc_invalid_set_cookies/OTP-12430' into maintMarcus Arendt2015-01-262-2/+36
| |\ \ \ \ \
| | * | | | | httpc: Avoid parsing invalid 'Set-Cookie' headersSina Samavati2015-01-202-2/+36
* | | | | | | Merge branch 'maint'Ingela Anderton Andin2015-01-262-56/+114
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'ia/ssh/sftp-v3-flags' into maintIngela Anderton Andin2015-01-262-56/+114
| |\ \ \ \ \ \
| | * | | | | | ssh: Add some more flagsIngela Anderton Andin2015-01-231-15/+17
| | * | | | | | ssh: Correct Sftp flag handlingIngela Anderton Andin2015-01-231-61/+59
| | * | | | | | ssh: Add handling of sftp v3 flagsIngela Anderton Andin2015-01-232-5/+63
* | | | | | | | Merge branch 'maint'Ingela Anderton Andin2015-01-260-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /