aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-06-10Merge branch 'maint'Fredrik Gustafsson
2013-06-10Merge branch 'fredrik/r16b01/prepare_release' into maintFredrik Gustafsson
* fredrik/r16b01/prepare_release: versions updates for erl_interface, et and os_mon
2013-06-07versions updates for erl_interface, et and os_monFredrik Gustafsson
2013-06-07Merge branch 'maint'Fredrik Gustafsson
2013-06-07Merge branch 'fredrik/ssh/appup_r16b01' into maintFredrik Gustafsson
* fredrik/ssh/appup_r16b01: ssh: appup changes
2013-06-07Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-06-07Merge branch 'ia/ssl/prepare-for-release' into maintIngela Anderton Andin
* ia/ssl/prepare-for-release: ssl: Prepare for release
2013-06-05Merge branch 'maint'Peter Andersson
2013-06-05Merge branch 'peppe/common_test/ct_testspec_verification.2' into maintPeter Andersson
* peppe/common_test/ct_testspec_verification.2: Fix error with testspec terms not being merged properly Fix problem with tests being wrongly added to separate specs Improve error report if crash due to bad testspec Add verification terms for test specification tests OTP-10857
2013-06-05Fix error with testspec terms not being merged properlyPeter Andersson
2013-06-05Fix problem with tests being wrongly added to separate specsPeter Andersson
2013-06-05Improve error report if crash due to bad testspecPeter Andersson
2013-06-05Add verification terms for test specification testsPeter Andersson
2013-06-05Merge branch 'maint'Lukas Larsson
* maint: erts: Update spec in preloaded to reflect sucess typing Conflicts: erts/preloaded/ebin/erlang.beam
2013-06-05Merge branch 'lukas/erts/gc_stat_contention/OTP-10271' into maintLukas Larsson
* lukas/erts/gc_stat_contention/OTP-10271: erts: Update spec in preloaded to reflect sucess typing
2013-06-05Merge branch 'maint'Patrik Nyblom
2013-06-05erts: Update spec in preloaded to reflect sucess typingLukas Larsson
2013-06-05Merge branch 'pan/unicode_error_wrong_offset' into maintPatrik Nyblom
* pan/unicode_error_wrong_offset: Fix faulty rest on error in unicode:characters_to_list OTP-11080
2013-06-05Merge branch 'pan/r16b01/system_monitor_long_schedule/OTP-11067' into maintPatrik Nyblom
* pan/r16b01/system_monitor_long_schedule/OTP-11067: Minor spelling correction Add system_monitor of long_schedule
2013-06-05Merge branch 'pan/win_now_jumps' into maintPatrik Nyblom
* pan/win_now_jumps: Enable use of GetTickCoun64 when available Intermediate code with lock on gettickcount() Tmp OTP-11146
2013-06-05Merge branch 'pan/raise_windows_version' into maintPatrik Nyblom
* pan/raise_windows_version: Raise the minimal supported Windows version OTP-11145
2013-06-05Merge branch 'siri/unmatched_returns/OTP-10908'Siri Hansen
* siri/unmatched_returns/OTP-10908: Fix unmatched_return warnings in release_handler
2013-06-05Merge branch 'siri/install-otp-in-unicode-path'Siri Hansen
* siri/install-otp-in-unicode-path: [sasl] Remove priv dir after release_handler_SUITE Update preloaded init.beam Allow unicode characters for boot and config in init:make_permanent [sasl] Clean priv_dir after systools_SUITE [reltool] Use unicode characters in work dir for unicode test [sasl] Use unicode characters in priv dir name also on windows [reltool] Write erl.ini as UTF-8 [sasl] Update tests to run under unicode path [sasl] Rewrite release_handler_SUITE:clean_priv_dir to work on unicode paths [sasl] Update example/target_system.erl to handle unicode [sasl] Write erl.ini as utf8, allowing unicode path for root dir and bin dir
2013-06-05Merge branch 'siri/kernel/heart-set_cmd-unicode/OTP-10843'Siri Hansen
* siri/kernel/heart-set_cmd-unicode/OTP-10843: Convert command string to encoded binary in heart:set_cmd/1 Conflicts: lib/kernel/src/heart.erl
2013-06-05Merge branch 'siri/spawn-and-space'Siri Hansen
* siri/spawn-and-space: [sasl] In test, quote erlsrv executable in call to open_port/2 [test_server] Quote path to erl executable when starting slave nodes Quote path to erl executable in slave to allow space in path [sasl] Quote path to program run with open_port({spawn,... [os_mon] Quote path to programs run with open_port({spawn,... Conflicts: lib/os_mon/src/nteventlog.erl
2013-06-05Merge branch 'maint'Björn-Egil Dahlberg
2013-06-05Merge branch 'egil/increase-eprof-usability/OTP-11144' into maintBjörn-Egil Dahlberg
* egil/increase-eprof-usability/OTP-11144: tools: Document new eprof options tools: Add options to eprof tools: Add testcase to eprof_SUITE tools: Refactor away ?line macro in eprof_SUITE
2013-06-05Merge branch 'maint'Fredrik Gustafsson
2013-06-05Merge branch 'jv/erl_lint-default_types/OTP-11143' into maintFredrik Gustafsson
* jv/erl_lint-default_types/OTP-11143: Updated primary bootstrap stdlib: re-factored erl_lint.erl Improve erl_lint performance
2013-06-05ssh: appup changesFredrik Gustafsson
2013-06-05ssl: Prepare for releaseIngela Anderton Andin
2013-06-05Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-06-05Merge branch 'ia/ssl/prep-dtls' into maintIngela Anderton Andin
* ia/ssl/prep-dtls: ssl: Structural perarparation to support DTLS ssl: Rename ssl_certificate_db to ssl_pkix_db for clarity
2013-06-05Merge branch 'maint'Fredrik Gustafsson
2013-06-05Merge branch 'fredrik/tools/emacs_bifs' into maintFredrik Gustafsson
* fredrik/tools/emacs_bifs: tools: Added gather_gc_info_result to bifs
2013-06-04ssl: Structural perarparation to support DTLSIngela Anderton Andin
Also phase in tls module as main API instead of ssl. To make API clearer. As TLS is the new protocol name. Maybe keep some API functions in ssl
2013-06-04ssl: Rename ssl_certificate_db to ssl_pkix_db for clarityIngela Anderton Andin
Conflicts: lib/ssl/src/ssl.app.src lib/ssl/src/ssl_manager.erl
2013-06-04Merge branch 'maint'Rickard Green
* maint: stdlib: Fix ets_SUITE memory tests
2013-06-04Merge branch 'rickard-sverker/carrier-migration/OTP-10279' into maintRickard Green
* rickard-sverker/carrier-migration/OTP-10279: stdlib: Fix ets_SUITE memory tests
2013-06-04stdlib: Fix ets_SUITE memory testsRickard Green
Need to take 'mbcs_pool' into account.
2013-06-04Merge branch 'maint'Peter Andersson
2013-06-04Merge remote branch 'origin/peppe/common_test/remove_end_per_tc_warning' ↵Peter Andersson
into maint * origin/peppe/common_test/remove_end_per_tc_warning: Remove incorrect warning about missing end_per_testcase OTP-11052
2013-06-04Merge branch 'maint'Peter Andersson
2013-06-04Merge remote branch 'origin/peppe/common_test/ct_conn_handling' into maintPeter Andersson
* origin/peppe/common_test/ct_conn_handling: Add test suite Fix faulty connection handling OTP-10126
2013-06-04Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-06-04Merge branch 'ia/crypto/tests' into maintIngela Anderton Andin
* ia/crypto/tests: crypto: Document enhancement crypto: Test suite completeness
2013-06-04tools: Added gather_gc_info_result to bifsFredrik Gustafsson
2013-06-04Merge branch 'maint'Fredrik Gustafsson
Conflicts: bootstrap/lib/stdlib/ebin/erl_pp.beam
2013-06-04Merge branch 'nox/erl_pp-callback/OTP-11140' into maintFredrik Gustafsson
* nox/erl_pp-callback/OTP-11140: Update primary bootstrap Support callback attributes in erl_pp
2013-06-04Merge branch 'dgud/win32_unicode'Dan Gudmundsson
* dgud/win32_unicode: erts: Windows, convert erlsrv to use widestring erts: Window start_erl now uses widechars/unicode Quote windows paths with spaces Handle space in paths in test Makefiles erts: Fix windows widestring args and paths in tools erts: Windows, use widechars for all paths during startup OTP-11135
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 09:37:11 +0000