aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-03-18Merge remote-tracking branch 'origin/peppe/fix_xcomp' into maintPeter Andersson
* origin/peppe/fix_xcomp: Modify the xcomp file for ARM and enable more flags Fix problem with variables not getting assigned during installation OTP-11441
2015-03-18Merge remote-tracking branch 'origin/peppe/common_test/tc_log_format' into maintPeter Andersson
* origin/peppe/common_test/tc_log_format: Modify the top section of the test case log file OTP-12518
2015-03-18Merge remote-tracking branch 'origin/peppe/common_test/log_cache_problem' ↵Peter Andersson
into maint * origin/peppe/common_test/log_cache_problem: Fix problem with directories not listed in expected order OTP-11400
2015-03-18Merge remote-tracking branch ↵Peter Andersson
'origin/peppe/common_test/ct_netconfc_action_ok' into maint * origin/peppe/common_test/ct_netconfc_action_ok: Handle {ok,Data} in RPC reply (decode_rpc_reply) OTP-12491
2015-03-18Merge remote-tracking branch 'origin/peppe/common_test/public_event_mgr' ↵Peter Andersson
into maint * origin/peppe/common_test/public_event_mgr: Add documentation Add API functions for reading CT event manager references OTP-12506
2015-03-18Merge branch 'hb/tools/unicode_fix/OTP-12567' into maintHans Bolinder
* hb/tools/unicode_fix/OTP-12567: tools: Fix a Unicode bug in the tags module
2015-03-17tools: Fix a Unicode bug in the tags moduleHans Bolinder
2015-03-17Merge branch 'rickard/port_control_flags_crash/OTP-12544' into maintRickard Green
* rickard/port_control_flags_crash/OTP-12544: Make access to control_flags safe in non-smp emulator
2015-03-17Merge branch 'rickard/find_emu_cc/OTP-12388' into maintRickard Green
* rickard/find_emu_cc/OTP-12388: Fix missing quotation in LM_FIND_EMU_CC
2015-03-17Merge branch 'rickard/otp_patch_apply/OTP-12565' into maintRickard Green
* rickard/otp_patch_apply/OTP-12565: Minor fixes
2015-03-17Minor fixesRickard Green
2015-03-17Merge branch 'rickard/otp_patch_apply/OTP-12565' into maintRickard Green
* rickard/otp_patch_apply/OTP-12565: Add support for patching of individual applications
2015-03-17Add support for patching of individual applicationsRickard Green
2015-03-16Merge branch 'ia/public_key/crls_dialyzer' into maintIngela Anderton Andin
* ia/public_key/crls_dialyzer: public_key: dialyzer fixes
2015-03-16Merge branch 'hans/version_updates' into maintHans Nilsson
2015-03-16ssh: uppdate version in vsn.mkHans Nilsson
2015-03-16eldap: uppdate version in vsn.mkHans Nilsson
2015-03-16Merge branch 'nlmills/docfix' into maintZandra Hird
* nlmills/docfix: Correct typo in erlang(3) documentation
2015-03-15Modify the top section of the test case log filePeter Andersson
2015-03-13Modify the xcomp file for ARM and enable more flagsPeter Andersson
2015-03-13Fix problem with variables not getting assigned during installationPeter Andersson
2015-03-13Merge branch 'raimo/infinite-loop-gethostbyname/OTP-12133' into maintRaimo Niskanen
* raimo/infinite-loop-gethostbyname/OTP-12133: Restore lookup order after test
2015-03-13public_key: dialyzer fixesIngela Anderton Andin
2015-03-12Fix problem with directories not listed in expected orderPeter Andersson
2015-03-12Merge branch 'shijiang1130/master' into maintZandra Hird
* shijiang1130/master: Add client example for using the SSH module OTP-12558
2015-03-12Merge branch 'mikpe/hipe-mfait-rwlock' into maintHenrik Nord
* mikpe/hipe-mfait-rwlock: hipe: change mfa_info_table lock to rwmutex OTP-12557
2015-03-12Merge branch 'mikpe/avoid-oversize-bignums' into maintHenrik Nord
* mikpe/avoid-oversize-bignums: don't leave a heap hole in erts_bs_get_integer_2 don't create oversize bignums in binary matching OTP-12556
2015-03-12Merge branch 'bjorn/asn1/double-ellipses/OTP-12546' into maintBjörn Gustavsson
* bjorn/asn1/double-ellipses/OTP-12546: asn1ct_gen: Correct generation of .hrl files for multiple ellipses Fix BER code generation
2015-03-11Merge branch 'dgud/testcasecuddle' into maintDan Gudmundsson
* dgud/testcasecuddle: mnesia: Flush late messages Add Debug info mnesia: better debug info when tests fail mnesia: Ensure tables are loaded before testing them
2015-03-10Merge branch 'josevalim/jv-binary-ets' into maintZandra Hird
* josevalim/jv-binary-ets: Support binary standard input in ets:i/1 OTP-12550
2015-03-09Merge branch 'mururu/fix-type' into maintZandra Hird
* mururu/fix-type: Fix typos in the public_key doc OTP-12549
2015-03-09Merge branch 'erland/ssh/time/OTP-12444' into maintErland Schönbeck
* erland/ssh/time/OTP-12444: Update misleading comment in ssh_basic_SUITE Update new time API and be back-compatible in ssh Use new time API and be back-compatible in ssh otp_SUITE: Ignore undefined functions in ssh
2015-03-09Restore lookup order after testRaimo Niskanen
2015-03-09Merge branch 'ia/public_key/crl/OTP-12547' into maintIngela Anderton Andin
* ia/public_key/crl/OTP-12547: public_key: Improve CRL handling support
2015-03-09public_key: Improve CRL handling supportIngela Anderton Andin
2015-03-07Correct typo in erlang(3) documentationNick Mills
2015-03-06asn1ct_gen: Correct generation of .hrl files for multiple ellipsesBjörn Gustavsson
2015-03-06Fix BER code generationDan Gudmundsson
PKIX1Explicit-2009 did not compile. This commit was cherry-picked from 3ab3b07a already merged into master.
2015-03-06Add client example for using the SSH moduleLinus.yuan
2015-03-06Merge branch 'peppe/common_test/makefile_issue' into maintPeter Andersson
* peppe/common_test/makefile_issue: Have make ignore the chmod command line in the makefile if it fails OTP-12179
2015-03-06Merge branch 'peppe/common_test/ct_telnet_timeout_error' into maintPeter Andersson
* peppe/common_test/ct_telnet_timeout_error: Make sure total_timeout can get triggered before idle_timeout OTP-12335
2015-03-06Merge remote-tracking branch ↵Peter Andersson
'origin/peppe/common_test/inconsistent_return_value' into maint * origin/peppe/common_test/inconsistent_return_value: Add tests Make it possible to skip test case by returning skipped tag OTP-12359
2015-03-06Merge remote-tracking branch 'origin/peppe/common_test/on_tc_fail_log' into ↵Peter Andersson
maint * origin/peppe/common_test/on_tc_fail_log: Modify some tests to verify that new functionality works Make it possible to print in the test case log from on_tc_* hook funcs OTP-12468
2015-03-06Merge branch 'leoliu/master' into maintZandra Hird
* leoliu/master: Two minor fixes OTP-12545
2015-03-06Make access to control_flags safe in non-smp emulatorRickard Green
2015-03-05Handle {ok,Data} in RPC reply (decode_rpc_reply)Peter Andersson
OTP-12491
2015-03-05Update misleading comment in ssh_basic_SUITEErland Schönbeck
2015-03-05Merge branch 'anders/diameter/grouped_decode/OTP-12475' into maintAnders Svensson
* anders/diameter/grouped_decode/OTP-12475: Allow encode of decoded diameter_avp list Add testcases for diameter_avp decode Fix handling of length errors on Grouped AVPs Don't discard component diameter_avp list on Grouped AVP decode error Fix process dictionary manipulation during message decode
2015-03-05Merge branch 'egil/fix-break-printout/OTP-12537' into maintBjörn-Egil Dahlberg
* egil/fix-break-printout/OTP-12537: erts: Fix erroneous printout in crashdump
2015-03-05Merge branch 'egil/fix-ts_make-unicode/OTP-12536' into maintBjörn-Egil Dahlberg
* egil/fix-ts_make-unicode/OTP-12536: test_server: Let ts_make have a latin1 fallback