aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-03-22Merge branch 'maint'Gustav Simonsson
2012-03-22Bump asn1 version numberGustav Simonsson
2012-03-22erts: Correct merge bug in 'erlang' doc srcRaimo Niskanen
2012-03-22Merge branch 'maint'Raimo Niskanen
Conflicts: erts/doc/src/erlang.xml erts/emulator/beam/erl_process.c erts/emulator/beam/erl_process.h erts/emulator/test/bif_SUITE.erl erts/preloaded/ebin/erlang.beam erts/preloaded/src/erlang.erl lib/hipe/cerl/erl_bif_types.erl
2012-03-22Merge branch 'raimo/close-ports-on-halt/OTP-9985' into maintRaimo Niskanen
* raimo/close-ports-on-halt/OTP-9985: erts: Basic test of erlang:halt/0..2 erts: Document erlang:halt/2 and update erlang:halt/0,1 erts: Implement erlang:halt/2 stdlib: Stop working around erlang:halt not flushing erts: Make erlang:halt/0,1 close ports and flush async threads erts: Remove forgotten and unused function erl_exit0 erts: Implement erl_halt erts: Remove unused ntbuild.erl
2012-03-22Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: Prepare for release Prepare for release Prepare for release
2012-03-22Merge branch 'ia/public_key/prepare-for-release' into maintIngela Anderton Andin
* ia/public_key/prepare-for-release: Prepare for release
2012-03-22Merge branch 'ia/ssh/prepare-for-release' into maintIngela Anderton Andin
* ia/ssh/prepare-for-release: Prepare for release
2012-03-22Merge branch 'ia/ssl/prepare-for-release' into maintIngela Anderton Andin
* ia/ssl/prepare-for-release: Prepare for release
2012-03-21Merge branch 'maint'Siri Hansen
2012-03-21Merge branch 'siri/reltool/fresh-up' into maintSiri Hansen
OTP-9792 OTP-9794 OTP-9967 OTP-9968 OTP-9980 OTP-9984 * siri/reltool/fresh-up: (27 commits) [reltool] Improve title of dependency colum [reltool] Update status bar for all config changes and for generate target [reltool] Fix GUI problems on Windows [reltool] Remove skip statement for test that failed due to stdlib error [sasl] Sort applications used by other applications correctly in .script [sasl] Doc that included applications in .rel defaults to same as in .app [reltool] Fix problems with sorting of applications [reltool] Just warn if same module occurs twice in .app file [reltool] Always return warnings as flat strings [reltool] Fix type spec and doc for app() and mod() [reltool] Move tables out of common record [reltool] Display warnings continously in GUI [reltool] Cleanup test code [reltool] Unset ERL_FLAGS when running escript from reltool_server_SUITE [reltool] Improve error handling [reltool] Fix rollback and undo [reltool] Link together escript with inlined application [reltool] Fix badmatch when starting GUI [reltool] Update state and tables consistently for all types of config changes [reltool] Add test cases for handling of escripts ...
2012-03-21Merge branch 'maint'Lukas Larsson
* maint: Add the surefire ct hook
2012-03-21Merge branch 'lukas/common_test/add_surefire_hook/OTP-9995' into maintLukas Larsson
* lukas/common_test/add_surefire_hook/OTP-9995: Add the surefire ct hook
2012-03-21Merge branch 'maint'Micael Karlberg
2012-03-21Merge branch 'bmk/inets/inets59_integration2' into maintMicael Karlberg
2012-03-21Merge branch 'maint'Patrik Nyblom
2012-03-21erts: Basic test of erlang:halt/0..2Raimo Niskanen
2012-03-21erts: Document erlang:halt/2 and update erlang:halt/0,1Raimo Niskanen
2012-03-21erts: Implement erlang:halt/2Raimo Niskanen
2012-03-21Merge branch 'pan/testcase-fix-bigboot' into maintPatrik Nyblom
* pan/testcase-fix-bigboot: Align java test Makefile.src with c tests ditto in ic Teach ei testsuites parallel make Teach edlin_expand_SUITE:init_per_suite independence Teach big_boot_embedded testcase about comte OTP-10008
2012-03-21Align java test Makefile.src with c tests ditto in icPatrik Nyblom
2012-03-21Teach ei testsuites parallel makePatrik Nyblom
2012-03-21Teach edlin_expand_SUITE:init_per_suite independencePatrik Nyblom
2012-03-21Teach big_boot_embedded testcase about comtePatrik Nyblom
2012-03-21Merge branch 'pan/remove_temp_files_io_proto_SUITE' into maintPatrik Nyblom
* pan/remove_temp_files_io_proto_SUITE: io_proto_SUITE: make sure temp files are removed OTP-10005
2012-03-21io_proto_SUITE: make sure temp files are removedPatrik Nyblom
2012-03-21Merge branch 'pan/win_doc_fix/OTP-9846' into maintPatrik Nyblom
* pan/win_doc_fix/OTP-9846: Correct build instruction for 32bit OpenSSL
2012-03-21Correct build instruction for 32bit OpenSSLPatrik Nyblom
Also made some visual improvements to the example command lines for wxWidgets/OpenSSL and made some minor updates to the build instructions for those libraries.
2012-03-21Prepare for releaseIngela Anderton Andin
Updates for ssh that needs to restarted so no need for soft upgrade
2012-03-21Merge branch 'maint'Dan Gudmundsson
2012-03-21Merge branch 'dgud/observer/fix-mem-graph' into maintDan Gudmundsson
* dgud/observer/fix-mem-graph: [observer] Remove system from memory graph
2012-03-21Merge branch 'dgud/wx/misc-improvements/OTP-9947' into maintDan Gudmundsson
* dgud/wx/misc-improvements/OTP-9947: [wx] Add more types [wx] Fix listctrl issues [wx] Fix bad defines [wx] Fix bad type references [wx] Fix missing export_types
2012-03-21Merge branch 'dgud/debugger/breakpoints_bug/OTP-9950' into maintDan Gudmundsson
* dgud/debugger/breakpoints_bug/OTP-9950: [debugger] Fixed disappearing breakpoints
2012-03-21stdlib: Stop working around erlang:halt not flushingRaimo Niskanen
2012-03-21erts: Make erlang:halt/0,1 close ports and flush async threadsRaimo Niskanen
2012-03-21erts: Remove forgotten and unused function erl_exit0Raimo Niskanen
2012-03-21erts: Implement erl_haltRaimo Niskanen
2012-03-21Prepare for releaseIngela Anderton Andin
Supervisor tree changed so can not do soft upgrade
2012-03-21Prepare for releaseIngela Anderton Andin
Distribution fixes so no need to soft upgrade.
2012-03-21Merge branch 'maint'Hans Bolinder
* maint: Make sure disk_log does not write too much data
2012-03-21Merge branch 'hb/kernel/too_greedy_disk_log/OTP-9999' into maintHans Bolinder
* hb/kernel/too_greedy_disk_log/OTP-9999: Make sure disk_log does not write too much data
2012-03-21Merge branch 'maint'Hans Bolinder
* maint: Fix continuation error Remove unused file Correct a minor bug in qlc's testsuite
2012-03-21Merge branch 'hb/stdlib/fix_qlc_suite/OTP-10000' into maintHans Bolinder
* hb/stdlib/fix_qlc_suite/OTP-10000: Correct a minor bug in qlc's testsuite
2012-03-21Merge branch 'lars/xmerl/continuation-error/OTP-9961' into maintLars Thorsen
* lars/xmerl/continuation-error/OTP-9961: Fix continuation error
2012-03-21Fix continuation errorLars Thorsen
2012-03-21Merge branch 'lars/xmerl/remove-unused-file/OTP-9965' into maintLars Thorsen
* lars/xmerl/remove-unused-file/OTP-9965: Remove unused file
2012-03-21Remove unused fileLars Thorsen
2012-03-20[observer] Remove system from memory graphDan Gudmundsson
It is confusing we have total and system is total - processes
2012-03-20Merge branch 'maint'Sverker Eriksson
2012-03-20Merge branch 'sverk/cpu-topology-crash' into maintSverker Eriksson
* sverk/cpu-topology-crash: erts: Fix memory corruption when reading topology info OTP-10004
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-05 02:42:09 +0000