aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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-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
2012-03-20Add the surefire ct hookLukas Larsson
The hook should work with modern versions of Jenkins CI to gather test results.
2012-03-20Correct a minor bug in qlc's testsuiteHans Bolinder
2012-03-20Make sure disk_log does not write too much dataHans Bolinder
While disk_log eagerly collects logged data for better performance, collecting too much data may choke the system and cause huge binaries to be written. The problem was addressed in OTP-9764, but the situation was not improved in all cases. Thanks to Richard Carlsson.
2012-03-20Merge branch 'maint'Gustav Simonsson
2012-03-20Merge branch 'gustav/ic/remove-warnings' into maintGustav Simonsson
* gustav/ic/remove-warnings: Bump version from 4.2.29 to 4.2.30 Add generation of Erlang callback functions to avoid compiler warnings of generated Erlang source code Seq12023 OTP-9998
2012-03-20Bump version from 4.2.29 to 4.2.30Gustav Simonsson
2012-03-20Merge branch 'maint'Gustav Simonsson
2012-03-20Merge branch 'maint'Sverker Eriksson
Conflicts: erts/preloaded/ebin/zlib.beam Rebuilt zlib.beam as part of this merge commit
2012-03-20[reltool] Improve title of dependency columSiri Hansen
OTP-9792 The colum listing modules that uses the current application or module did earlier have the title "Modules used by others". This is now changed to "Modules using this".
2012-03-20Merge branch 'dc/dch-fix-win32-escript' into maintGustav Simonsson
* dc/dch-fix-win32-escript: add escript win32 alternative invocation (thanks Pierre Rouleau) OTP-9997
2012-03-20[reltool] Update status bar for all config changes and for generate targetSiri Hansen
OTP-9792 For some configuration changes and during generation of target system, there was no indication in the status bar that reltool was working. This has been corrected - it now says "Processing libraries...".
2012-03-20Merge branch 'sverk/zlib_port_leak' into maintSverker Eriksson
* sverk/zlib_port_leak: Fix port leaks in zlib OTP-9981