aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-05-11Merge branch 'hans/ssh/check_kex_e_f_in_range/OTP-12649'Hans Nilsson
* hans/ssh/check_kex_e_f_in_range/OTP-12649: ssh: Check e and f parameters in kexdh
2015-05-11Merge branch 'aw/native-cpu_sup/OTP-12730'Björn-Egil Dahlberg
* aw/native-cpu_sup/OTP-12730: erts: Fix configure.in os_mon: rename send() to sendi() in cpu_sup.c os_mon: cpu_sup should use native sysctl/libkvm calls on BSD
2015-05-11Merge branch 'egil/fix-maps-erts_debug-size'Björn-Egil Dahlberg
* egil/fix-maps-erts_debug-size: erts: Fix erts_debug:size/1 for large Maps erts: Simple test of erts_debug:size/1 of Maps
2015-05-08Merge branch 'sg2342/fix_freebsd_sendfile/OTP-12720'Sverker Eriksson
* sg2342/fix_freebsd_sendfile/OTP-12720: Fix FreeBSD sendfile
2015-05-08Merge branch 'sverk/erts-fp-exception-fixes/OTP-12717'Sverker Eriksson
* sverk/erts-fp-exception-fixes/OTP-12717: erts: Disable float exceptions for clang/llvm erts: Increase buffer in erts_fp_check_init_error
2015-05-08erts: Fix erts_debug:size/1 for large MapsBjörn-Egil Dahlberg
2015-05-08erts: Simple test of erts_debug:size/1 of MapsBjörn-Egil Dahlberg
2015-05-08Merge branch 'rickard/timer-optimization/OTP-12650'Rickard Green
* rickard/timer-optimization/OTP-12650: Optimized timer implementation Reusable red-black tree implementation Conflicts: erts/emulator/beam/erl_bif_timer.c
2015-05-08Merge branch 'rickard/time-improvement/OTP-11997'Rickard Green
* rickard/time-improvement/OTP-11997: Allow execution of estone suite on pre OTP-18 systems Add parallel time monotonicity test-case Replace usage of erlang:now() in line-tracing Replace erlang:now() usage in emulator suite Replace erlang:now() usage in system suite Misc time improvements
2015-05-08Optimized timer implementationRickard Green
2015-05-08Merge branch 'ia/public_key/improve_docs'Ingela Anderton Andin
* ia/public_key/improve_docs: public_key: Add clarifications public_key: Align types with removal of legacy ASN.1 flags public_key: Align to alphabetical order public_key: Correct application names and typos public_key: Change structure to what editor intended Editorial changes
2015-05-08ssh: Check e and f parameters in kexdhHans Nilsson
rfc 4253 says in section 8 that: "Values of 'e' or 'f' that are not in the range [1, p-1] MUST NOT be sent or accepted by either side. If this condition is violated, the key exchange fails." This commit implements the reception check.
2015-05-08Merge branch 'bjorn/asn1/doc'Björn Gustavsson
* bjorn/asn1/doc: asn1_spec: Correct obsolete details about compiler options Update asn1 documentation
2015-05-08Merge branch 'richcarl/md5-fixes'Björn Gustavsson
* richcarl/md5-fixes: Set module_info md5 for native modules properly Add module_info entry for native code Gracefully handle empty md5 field in module_info Remove 'imports' key from spec of get_module_info()
2015-05-08Merge branch 'bruce-yinhe/fixed_typo_in_maps_doc'Zandra Hird
* bruce-yinhe/fixed_typo_in_maps_doc: Fixed a typo in Maps doc
2015-05-08Fixed a typo in Maps docBruce Yinhe
2015-05-08Merge branch 'horvand/filtermap-doc-comma-fix'Zandra Hird
* horvand/filtermap-doc-comma-fix: Delete superfluous comma from `filtermap' example
2015-05-08Delete superfluous comma from `filtermap' exampleAndras Horvath
The code explaining the behaviour of `filtermap/2` had a syntax error and wouldn't compile
2015-05-08Merge branch 'hb/typer/erl_anno_fix'Hans Bolinder
* hb/typer/erl_anno_fix: typer: Properly extract annotations
2015-05-08typer: Properly extract annotationsHans Bolinder
The addition of the erl_anno module, OTP-12195, also modified v3_core so that functions with line number zero are regarded as compiler generated.
2015-05-08Merge branch 'michaelklishin/patch-1'Zandra Hird
* michaelklishin/patch-1: Fix a typo
2015-05-08Fix a typoMichael Klishin
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-08asn1_spec: Correct obsolete details about compiler optionsBjörn Gustavsson
There is now only one BER back-end, and there is no 'optimize' option.
2015-05-08Update asn1 documentationxsipewe
Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Björn Gustavsson.
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-07public_key: Add clarificationsIngela Anderton Andin