aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-05-08Merge branch 'fishcakez/ct_test_dirs'Zandra Hird
* fishcakez/ct_test_dirs: Fix parsing list of one test directory in ct:run_test/1
2015-05-08Merge branch 'nox/test_server-lines'Zandra Hird
* nox/test_server-lines: Undocument the line macro in test_server
2015-05-08Merge branch 'aronisstav/dialyzer-inv-mult'Zandra Hird
* aronisstav/dialyzer-inv-mult: Fix a bug related to constraints generated for erlang:'*'/2 OTP-12725
2015-05-08Merge branch 'hb/document_identifier_type/OTP-11306'Hans Bolinder
* hb/document_identifier_type/OTP-11306: dialyzer: document the type identifier()
2015-05-08dialyzer: document the type identifier()Hans Bolinder
2015-05-08Merge branch 'lars/remove_now/OTP-12687'Lars Thorsen
* lars/remove_now/OTP-12687: [orber, cos*] Remove usage of erlang:now() in test suites [orber] Use rand instead of random [orber, cos*] Bump versions and update dependencies in app file [orber, cos*] Remove usage of erlang:now()
2015-05-08[orber, cos*] Remove usage of erlang:now() in test suitesLars Thorsen
2015-05-08[orber] Use rand instead of randomLars Thorsen
2015-05-08[orber, cos*] Bump versions and update dependencies in app fileLars Thorsen
2015-05-08[orber, cos*] Remove usage of erlang:now()Lars Thorsen
2015-05-08Update primary bootstrapBjörn Gustavsson
2015-05-08Merge branch 'bjorn/stdlib/fix-filename-split/OTP-12716'Björn Gustavsson
* bjorn/stdlib/fix-filename-split/OTP-12716: Correct filename:split(<<"">>)
2015-05-08Merge branch 'bjorn/kernel/code-loading'Björn Gustavsson
* bjorn/kernel/code-loading: code: Make load_native_code_for_all_loaded/0 comply to spec
2015-05-08Merge branch 'nox/compiler/parse_transform-undef/OTP-12723'Björn Gustavsson
* nox/compiler/parse_transform-undef/OTP-12723: Properly report unknown parse transforms
2015-05-08Merge branch 'dgud/stdlib/rand/OTP-12586'Dan Gudmundsson
* dgud/stdlib/rand/OTP-12586: stdlib: Document and add normal distributed random value function stdlib: Add new random functionality/module
2015-05-08Merge branch 'lars/erl_docgen/extra_first_page_info/OTP-12722'Lars Thorsen
* lars/erl_docgen/extra_first_page_info/OTP-12722: [erl_docgen] Add the extra front page info to pdf [erl_docgen] Update style for extra front page info [erl_docgen] Add possibility to add extra ino line on front page
2015-05-08[erl_docgen] Add the extra front page info to pdfLars Thorsen
2015-05-08[erl_docgen] Update style for extra front page infoLars Thorsen
2015-05-08[erl_docgen] Add possibility to add extra ino line on front pageLars Thorsen
2015-05-08Merge branch 'lars/xmerl/fix-warnings/OTP-12689'Lars Thorsen
* lars/xmerl/fix-warnings/OTP-12689: [xmerl] Fix compiler warnings
2015-05-08[xmerl] Fix compiler warningsLars Thorsen
2015-05-07Merge branch 'hans/eldap/prepare_release'Hans Nilsson
* hans/eldap/prepare_release: eldap: update vsn.mk to 1.2
2015-05-07eldap: update vsn.mk to 1.2Hans Nilsson
2015-05-07Merge branch 'egil/fix-pos-zero-opt'Björn-Egil Dahlberg
* egil/fix-pos-zero-opt: erts: Don't let the compiler optimize pos. zero fix
2015-05-07Merge branch 'egil/fix-ts_install-hook'Björn-Egil Dahlberg
* egil/fix-ts_install-hook: test_server: Fix install_hook
2015-05-07code: Make load_native_code_for_all_loaded/0 comply to specBjörn Gustavsson
7309ff4c38325 introduced a mismatch between load_native_code_for_all_loaded/0 and its spec. We could just delete spec, but it is cleaner to ensure that the function always returns 'ok'. Noticed-by: Tuncer Ayaz
2015-05-07Merge branch 'henrik/update-javaversion'Henrik Nord
* henrik/update-javaversion: update java version OTP-12715
2015-05-07asn1: Remove increasingly obsolete comment in vsn.mkBjörn Gustavsson
2015-05-07Merge branch 'ia/ssh/extra-logout'Ingela Anderton Andin
* ia/ssh/extra-logout: ssh: Hadle shell that sends two logout messages
2015-05-07Merge branch 'hans/ssh/prepare_release'Hans Nilsson
* hans/ssh/prepare_release: ssh: update vsn.mk to 4.0
2015-05-07ssh: update vsn.mk to 4.0Hans Nilsson
2015-05-06erts: Don't let the compiler optimize pos. zero fixBjörn-Egil Dahlberg
2015-05-06Merge branch 'sverk/hipe_match_wbin/OTP-12667'Sverker Eriksson
* sverk/hipe_match_wbin/OTP-12667: erts: Add debug assertions for match state sanity hipe: Add test for matching of writable binary erts,hipe: Optimize away calls to emasculate_binary erts,hipe: Fix bug in binary matching of writable binary Conflicts: erts/emulator/hipe/hipe_bif0.c
2015-05-06Correct filename:split(<<"">>)Björn Gustavsson
filename:split("") returns [], while filename:split(<<"">>) returns [<<"/">>]. Since the support in the filename module for binary arguments is much more recent than support for strings, change filename:split(<<"">>) so that it returns []. Noticed-by: KOUCHANG
2015-05-06Merge branch 'maint'Zandra Hird
Conflicts: OTP_VERSION erts/vsn.mk lib/test_server/src/erl2html2.erl
2015-05-06Updated OTP versionOTP-17.5.3Erlang/OTP
2015-05-06Prepare releaseErlang/OTP
2015-05-06Merge branch 'anders/diameter/17.5.3/OTP-12702' into maint-17Erlang/OTP
* anders/diameter/17.5.3/OTP-12702: Fix broken pre-17.4 appup Update appup for 17.5.3 vsn -> 1.9.1
2015-05-06Merge branch 'anders/diameter/counters/OTP-12701' into maint-17Erlang/OTP
* anders/diameter/counters/OTP-12701: Add counters testcase to 3xxx suite Fix counting error with unknown application id Add missing doc wording
2015-05-06Merge branch 'anders/diameter/result_codes/OTP-12654' into maint-17Erlang/OTP
* anders/diameter/result_codes/OTP-12654: Fix broken traffic testcase Match harder in traffic suite Don't confuse Result-Code and Experimental-Result
2015-05-06Merge branch 'anders/diameter/extra_avp_bit/OTP-12642' into maint-17Erlang/OTP
* anders/diameter/extra_avp_bit/OTP-12642: Remove extra avp bit from diameter_avp decode
2015-05-06Merge branch 'dgud/common_test/netconf-user-caps/OTP-12707' into maint-17Erlang/OTP
* dgud/common_test/netconf-user-caps/OTP-12707: common_test: Add user capability option to hello
2015-05-06Merge branch 'peppe/common_test/ct_telnet_wait_for_prompt.maint' into maint-17Erlang/OTP
* peppe/common_test/ct_telnet_wait_for_prompt.maint: Introduce wait_for_prompt option
2015-05-06Merge branch 'peppe/common_test/timetrap_line.maint' into maint-17Erlang/OTP
* peppe/common_test/timetrap_line.maint: Fix problem with line number not always showing in log
2015-05-06Merge branch 'peppe/common_test/modify_vts.maint' into maint-17Erlang/OTP
* peppe/common_test/modify_vts.maint: Get the VTS mode working with private CT version of webtool Change order of ct_run help sections Prepare for webtool integration with CT
2015-05-06Merge branch 'peppe/common_test/longname_problem.maint' into maint-17Erlang/OTP
* peppe/common_test/longname_problem.maint: Fix error in ct_logs, not handling long names correctly
2015-05-06Merge branch 'peppe/test_tools_vsn.maint' into maint-17Erlang/OTP
* peppe/test_tools_vsn.maint: Bump version numbers
2015-05-06Merge branch 'dgud/common_test/netconf/OTP-12698' into maint-17Erlang/OTP
* dgud/common_test/netconf/OTP-12698: common_test: Recurse when there is more data in netconf
2015-05-06Merge branch 'raimo/snmp/net_if-port-0-with-fd-option/OTP-12669' into maint-17Erlang/OTP
* raimo/snmp/net_if-port-0-with-fd-option/OTP-12669: Improve agent fix as in manager Use port 0 with {fd,Fd}, use snmpm_fd in manager
2015-05-06Update primary bootstrapBjörn Gustavsson