aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-05-03Merge branch 'maint'Lukas Larsson
* maint: Fix include issues in when building tests Fix cross compile of testcases Update cross build system for tests to work
2012-05-03Merge branch 'sverk/cross_tests/OTP-10074' into maintLukas Larsson
* sverk/cross_tests/OTP-10074: Fix include issues in when building tests Fix cross compile of testcases Update cross build system for tests to work
2012-05-02Merge branch 'maint'Björn-Egil Dahlberg
2012-05-02Merge branch 'egil/fix-run_erl/OTP-10076' into maintBjörn-Egil Dahlberg
* egil/fix-run_erl/OTP-10076: run_erl: Set controlling terminal run_erl: Use openpty slave descriptor run_erl: Retry interrupted system calls
2012-05-02Merge branch 'maint'Björn Gustavsson
* maint: otp_SUITE: Prefix MFAs with the application they belong to
2012-05-02otp_SUITE: Prefix MFAs with the application they belong toBjörn Gustavsson
2012-05-02Fix include issues in when building testsLukas Larsson
2012-05-02Fix cross compile of testcasesLukas Larsson
2012-05-02Update cross build system for tests to workLukas Larsson
ts has been fixed to again work in a cross build environment. See ts:help() and xcomp/README.md for details about how it works.
2012-04-30Merge branch 'maint'Björn-Egil Dahlberg
2012-04-30Merge branch 'egil/fix-port-io-statistics/OTP-10073' into maintBjörn-Egil Dahlberg
* egil/fix-port-io-statistics/OTP-10073: erts: Add port-I/O statistics for active once/true
2012-04-27run_erl: Set controlling terminalBjörn-Egil Dahlberg
2012-04-27run_erl: Use openpty slave descriptorBjörn-Egil Dahlberg
2012-04-27Merge branch 'maint'Björn-Egil Dahlberg
2012-04-27Merge branch 'egil/fix-compiler-warnings' into maintBjörn-Egil Dahlberg
* egil/fix-compiler-warnings: erl_docgen: Do not overflow images for pdf doc gen kernel: Fix missing documentation link anchors megaco: Fix parallel make for behaviours inets: Fix parallel make for behaviours ssh: Fix parallel make for behaviours eunit: Fix parallel make for behaviours ssl: Fix parallel make for behaviours wx: configure.in needs AC_LANG_SOURCE gs: Suppress ignored result warning erts: Remove unused variable
2012-04-27erl_docgen: Do not overflow images for pdf doc genBjörn-Egil Dahlberg
2012-04-27kernel: Fix missing documentation link anchorsBjörn-Egil Dahlberg
2012-04-27megaco: Fix parallel make for behavioursBjörn-Egil Dahlberg
2012-04-27inets: Fix parallel make for behavioursBjörn-Egil Dahlberg
2012-04-27ssh: Fix parallel make for behavioursBjörn-Egil Dahlberg
2012-04-27eunit: Fix parallel make for behavioursBjörn-Egil Dahlberg
2012-04-27ssl: Fix parallel make for behavioursBjörn-Egil Dahlberg
2012-04-27wx: configure.in needs AC_LANG_SOURCEBjörn-Egil Dahlberg
2012-04-27gs: Suppress ignored result warningBjörn-Egil Dahlberg
* The whole 'handle_external_read' seems suspicious Keep original behaviour and just suppress
2012-04-27erts: Remove unused variableBjörn-Egil Dahlberg
2012-04-27Merge branch 'maint'Sverker Eriksson
2012-04-27Merge branch 'maint'Sverker Eriksson
Conflicts: erts/emulator/beam/erl_process.c
2012-04-27Merge branch 'maint-r15' into maintLars Thorsen
* maint-r15: Update release notes Fix continuation bug in parse_default_decl_1/2
2012-04-27Merge branch 'maint-r15' into maintSverker Eriksson
Conflicts: erts/vsn.mk
2012-04-27erts: Add port-I/O statistics for active once/trueBjörn-Egil Dahlberg
2012-04-27Merge branch 'rickard/proc-sched/OTP-9892'Rickard Green
* rickard/proc-sched/OTP-9892: Teach etp-commands to understand new emulator internal data structures Optimize process state changes Optimize process table access Implement possibility to use ordinary mutexes as process locks Conflicts: erts/emulator/beam/erl_alloc.types
2012-04-27Teach etp-commands to understand new emulator internal data structuresRickard Green
2012-04-27Optimize process state changesRickard Green
2012-04-25Update release notesErlang/OTP
2012-04-25Merge branch 'lars/xmerl/cont-error-default-decl/OTP-10063' into maint-r15Erlang/OTP
* lars/xmerl/cont-error-default-decl/OTP-10063: Fix continuation bug in parse_default_decl_1/2
2012-04-25Prepare releaseSverker Eriksson
2012-04-25Merge branch 'rickard/driver_system_info/OTP-10059' into maint-r15Erlang/OTP
* rickard/driver_system_info/OTP-10059: Clear number of async threads if no thread support
2012-04-25Merge branch 'rickard/no_ets_write_concurrency-r15b01/OTP-10048' into maint-r15Erlang/OTP
* rickard/no_ets_write_concurrency-r15b01/OTP-10048: Remove unnecessary memory barriers in ETS when no write_concurrency is used
2012-04-25Merge branch 'rickard/sched-busy-wait/OTP-10044' into maint-r15Erlang/OTP
* rickard/sched-busy-wait/OTP-10044: Add switch controlling scheduler busy wait Conflicts: erts/emulator/beam/erl_process.c erts/emulator/beam/erl_process.h
2012-04-25Merge branch 'rickard/sched-wakeup-other-r15b01/OTP-10033' into maint-r15Erlang/OTP
* rickard/sched-wakeup-other-r15b01/OTP-10033: Implement proposal for new scheduler wakeup strategy
2012-04-24Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: Corrected ssh option handling
2012-04-24Merge branch 'ia/ssh/options-check-OTP-10061' into maintIngela Anderton Andin
* ia/ssh/options-check-OTP-10061: Corrected ssh option handling
2012-04-24Corrected ssh option handlingIngela Anderton Andin
The option ip_v6_disabled and the undocumented option exec was incorrectly handled by the option checking code. There where two options for allowing user interaction one documented and one undocumented, they where merge to to be the documented one. For backwards compatibility the undocumented one is transformed to the documented one in the option checking code.
2012-04-24Merge branch 'maint'Ingela Anderton Andin
* maint: Avoid sending two ssh close messages
2012-04-24Merge branch 'ia/ssh/close/OTP-10060' into maintIngela Anderton Andin
* ia/ssh/close/OTP-10060: Avoid sending two ssh close messages
2012-04-23Merge branch 'rickard/sched-wakeup-other/OTP-10033' into ↵Rickard Green
rickard/sched-wakeup-other-r15b01/OTP-10033 Conflicts: erts/emulator/beam/erl_process.c erts/vsn.mk
2012-04-23Add switch controlling scheduler busy waitRickard Green
2012-04-23Implement proposal for new scheduler wakeup strategyRickard Green
2012-04-23Merge branch 'maint'Björn-Egil Dahlberg
2012-04-23Merge branch 'egil/fix-wa-lcnt-debug' into maintBjörn-Egil Dahlberg
* egil/fix-wa-lcnt-debug: erts: The lck->extra field needs 'TAGGED' data