aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-11-29Merge branch 'maint'Sverker Eriksson
2013-11-29Merge branch 'sverk/bit-cmp-bug/OTP-11501' into maintSverker Eriksson
* sverk/bit-cmp-bug/OTP-11501: erts: Fix invalid read when appending binaries during call trace erts: Optimize comparison for bitstrings with byte aligned start erts: Fix invalid read in bitstring comparison
2013-11-29Merge branch 'maint'Anders Svensson
2013-11-29Merge branch 'anders/diameter/capx_dictionary/OTP-11361' into maintAnders Svensson
* anders/diameter/capx_dictionary/OTP-11361: Don't hardcode diameter_base @prefix on common dictionary
2013-11-29Merge branch 'maint'Henrik Nord
2013-11-29Merge branch 'richcarl/fix-sasl-handler-docs' into maintHenrik Nord
* richcarl/fix-sasl-handler-docs: Fix confusing documentation about error handlers in SASL OTP-11507
2013-11-29Merge branch 'maint'Henrik Nord
2013-11-29Merge branch 'nox/igor-funs' into maintHenrik Nord
* nox/igor-funs: Remove a useless function clause in erl_syntax_lib Fix transformation of implicit funs in igor Fix reverting of implicit funs OTP-11506
2013-11-29Merge branch 'maint'Henrik Nord
2013-11-29Merge branch 'bsmr-erlang/fix_wx_typos' into maintHenrik Nord
* bsmr-erlang/fix_wx_typos: fix documentation OTP-11505
2013-11-29Merge branch 'siri/ct_netconfc/close_session-timeout-hangs/OTP-11478' into maintSiri Hansen
* siri/ct_netconfc/close_session-timeout-hangs/OTP-11478: [common_test] Don't hang netconf client when close-session times out
2013-11-29Merge branch 'siri/cuddle-with-tests' into maintSiri Hansen
* siri/cuddle-with-tests: [observer] Fix copy/paste error in observer_SUITE:app_file/1 [common_test] Minor corrections in test of ct_netconfc
2013-11-29Merge branch 'sv/file-osync/OTP-11498'Lukas Larsson
* sv/file-osync/OTP-11498: Add sync option to file:open/2 Conflicts: erts/preloaded/ebin/prim_file.beam
2013-11-29Merge branch 'maint'Dan Gudmundsson
Conflicts: erts/etc/win32/Install.c
2013-11-29Merge branch 'dgud/mnesia/sticky-race/OTP-11375' into maintDan Gudmundsson
* dgud/mnesia/sticky-race/OTP-11375: mnesia: Synchronize lock cleanup after mnesia down
2013-11-29Merge branch 'dgud/sasl/no_dot_erlang_boot/OTP-8479' into maintDan Gudmundsson
* dgud/sasl/no_dot_erlang_boot/OTP-8479: sasl: Add no_dot_erlang documentation and tests sasl: Add no_dot_erlang start script
2013-11-28Merge branch 'maint'Peter Andersson
2013-11-28Merge remote branch 'origin/peppe/common_test/change_skip_behaviour' into maintPeter Andersson
* origin/peppe/common_test/change_skip_behaviour: Modify the auto_skip report for group config funcs to include group name Fix problems with info functions and add more tests Add test cases for new and modified functionality Fix problem with suites and groups skipped from test specification Change report tag for failed init_per_testcase from skipped to auto_skipped Add tests for skipping parallel groups Correct tests cases that fail because of modified events Correct various bugs related to auto_skip and groups Change status from skip to auto_skip for config func that fails due to require Fix problem with handling Config and FW reports correctly Change skip vs auto_skip behaviour OTP-11305
2013-11-28Don't hardcode diameter_base @prefix on common dictionaryAnders Svensson
2013-11-28Merge branch 'maint'Rickard Green
* maint: Fix prim_inet:close/1 Ensure exit signal due to link precede port BIF return Conflicts: erts/preloaded/ebin/prim_inet.beam
2013-11-28Merge branch 'rickard/prim_inet_close/OTP-11491' into maintRickard Green
* rickard/prim_inet_close/OTP-11491: Fix prim_inet:close/1
2013-11-28Merge branch 'rickard/port_bifs_fix/OTP-11489' into maintRickard Green
* rickard/port_bifs_fix/OTP-11489: Ensure exit signal due to link precede port BIF return
2013-11-28Merge branch 'maint'Lukas Larsson
* maint: Revert "Merge branch 'fredrik/doc/syntax_highlight/OTP-11237' into maint"
2013-11-28Revert "Merge branch 'fredrik/doc/syntax_highlight/OTP-11237' into maint"Lukas Larsson
This reverts commit 1562340596938d1f8a84b2ed43f5f0097be66ae7, reversing changes made to a5128108ad3efff77c5080f0769737e70a0bfd82.
2013-11-28Merge branch 'maint'Lukas Larsson
* maint: Improve error info when main carrier creation fails
2013-11-28Merge branch 'lukas/erts/supercarrier_fix/OTP-11149' into maintLukas Larsson
* lukas/erts/supercarrier_fix/OTP-11149: Improve error info when main carrier creation fails Conflicts: erts/emulator/test/alloc_SUITE.erl
2013-11-28Merge branch 'jf/mnesia_monitor_nodedown_race_fix'Henrik Nord
* jf/mnesia_monitor_nodedown_race_fix: Fix race condition in mnesia_monitor OTP-11497
2013-11-28Fix race condition in mnesia_monitorJonas Falkevik
Mnesia_monitor detect mnesia down using a remote process link and net_kernel nodeup to detect that a node are reacable again. If there is a short node communication problem. The node-down and node-up events can happen before the remotely linked process generates an 'EXIT'. When node-down and node-up events are recevied they are stored and later checked if the node came up just before mnesia flagged the node as down.
2013-11-27Merge branch 'maint'Sverker Eriksson
2013-11-27Merge branch 'sverk/crypto-no_answer_from_tc_supervisor' into maintSverker Eriksson
* sverk/crypto-no_answer_from_tc_supervisor: crypto: Avoid test_server crash 'no_answer_from_tc_supervisor'
2013-11-27Merge branch 'maint'Sverker Eriksson
2013-11-27Merge branch 'sverk/bin2term-bitstr-bugs/OTP-11479' into maintSverker Eriksson
* sverk/bin2term-bitstr-bugs/OTP-11479: erts: Fix bug in binary_to_term for binaries larger than 2^31 erts: Fix bugs in binary_to_term for invalid bitstrings
2013-11-27Merge branch 'maint'Sverker Eriksson
2013-11-27Merge branch 'sverk/allctr-4byte-align-bug' into maintSverker Eriksson
* sverk/allctr-4byte-align-bug: erts: Fix alignment bug in allocator start code OTP-11496
2013-11-27erts: Fix invalid read when appending binaries during call traceSverker Eriksson
Found by valgrind. Probably safe on opt-VM due to CHICKEN_PAD.
2013-11-27Merge branch 'maint'Sverker Eriksson
2013-11-27Merge branch 'sverk/zlib_SUITE-large_deflate-fix' into maintSverker Eriksson
* sverk/zlib_SUITE-large_deflate-fix: kernel: Fix zlib_SUITE:large_deflate
2013-11-27Merge branch 'maint'Ingela Anderton Andin
2013-11-27Merge branch 'ia/ssh/no_io/OTP-11490' into maintIngela Anderton Andin
* ia/ssh/no_io/OTP-11490: ssh: Correct arity in ssh_no_io.erl
2013-11-27Merge branch 'maint'Ingela Anderton Andin
2013-11-27Merge branch 'ia/ssh/close/OTP-11363' into maintIngela Anderton Andin
* ia/ssh/close/OTP-11363: ssh: Correct close handling
2013-11-26erts: Optimize comparison for bitstrings with byte aligned startSverker Eriksson
2013-11-26erts: Fix invalid read in bitstring comparisonSverker Eriksson
Valgrind complained that erts_cmp_bits sometimes read one byte too much from bitstrings. The byte was never used and the invalid read is safe in opt-VM due to padding in binary allocation (CHICKED_PAD).
2013-11-26Merge branch 'maint'Micael Karlberg
Conflicts: lib/snmp/doc/src/snmpm_user.xml
2013-11-26[observer] Fix copy/paste error in observer_SUITE:app_file/1Siri Hansen
2013-11-26Merge branch 'bmk/snmp/snmp425_integration' into maintMicael Karlberg
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/src/misc/snmp_log.erl lib/snmp/vsn.mk
2013-11-26kernel: Fix zlib_SUITE:large_deflateSverker Eriksson
Commontest doesn't like arity 0 function with same name as test case.
2013-11-26Fix prim_inet:close/1Rickard Green
2013-11-26Ensure exit signal due to link precede port BIF returnRickard Green
2013-11-26Merge branch 'maint'Raimo Niskanen
Conflicts: erts/preloaded/ebin/prim_inet.beam lib/kernel/test/gen_sctp_SUITE.erl