aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-06-10Merge branch 'maint'Dan Gudmundsson
2013-06-10Merge branch 'dgud/mnesia-unsubscribe-fix' into maintDan Gudmundsson
* dgud/mnesia-unsubscribe-fix: mnesia: Fix (timing issue) testcase mnesia: Fix unsubscribe error handling
2013-06-10Merge branch 'maint'Fredrik Gustafsson
2013-06-10Merge branch 'lh/fix-doc-reserved-words/OTP-11158' into maintFredrik Gustafsson
* lh/fix-doc-reserved-words/OTP-11158: Remove 'query' from the list of reserved words in docs
2013-06-10Merge branch 'maint'Lukas Larsson
* maint: erts: Update spec in preloaded to reflect success typing (again) Conflicts: erts/preloaded/ebin/erlang.beam
2013-06-10Merge 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 success typing (again)
2013-06-10Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-06-10Merge branch 'ia/crypto/doc' into maintIngela Anderton Andin
* ia/crypto/doc: crypto & public_key: Clearify documentation.
2013-06-10Merge branch 'ia/ssl/public_key/warnings' into maintIngela Anderton Andin
* ia/ssl/public_key/warnings: ssl: Correct rebase mistakes
2013-06-10Merge branch 'ia/ssl/dialyzer' into maintIngela Anderton Andin
* ia/ssl/dialyzer: ssl: Fix dialyzer warnings
2013-06-10Merge branch 'maint'Björn Gustavsson
* maint: PER/UPER: Correct decoding of SEQUENCEs with more than 64 extensions testConstraints: Improve tests of semi-constrained INTEGERs Test ENUMERATED with many extended values PER, UPER: Fix record name mismatch between HRL file and decoding code UPER: Correct encoding of ENUMERATED with more than 63 extended values Add asn1_test_lib:hex_to_bin/1
2013-06-10Merge branch 'bjorn/asn1/not-small-bugs/OTP-11153' into maintBjörn Gustavsson
* bjorn/asn1/not-small-bugs/OTP-11153: PER/UPER: Correct decoding of SEQUENCEs with more than 64 extensions testConstraints: Improve tests of semi-constrained INTEGERs Test ENUMERATED with many extended values UPER: Correct encoding of ENUMERATED with more than 63 extended values Add asn1_test_lib:hex_to_bin/1
2013-06-10Merge branch 'bjorn/asn1/fix-extension-addition-groups/OTP-11154' into maintBjörn Gustavsson
* bjorn/asn1/fix-extension-addition-groups/OTP-11154: PER, UPER: Fix record name mismatch between HRL file and decoding code
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-10Remove 'query' from the list of reserved words in docsLoïc Hoguin
Credits go to Matthias Endler for finding it.
2013-06-08PER/UPER: Correct decoding of SEQUENCEs with more than 64 extensionsBjörn Gustavsson
2013-06-08testConstraints: Improve tests of semi-constrained INTEGERsBjörn Gustavsson
Make sure that semi-constrained integers are correctly encoded in the mininum number of bytes. (The roundtrip test does not catch problems with non-minimal encodings.) Also test huge values that must be encoded in 128 or 256 bytes.
2013-06-08Test ENUMERATED with many extended valuesBjörn Gustavsson
2013-06-07PER, UPER: Fix record name mismatch between HRL file and decoding codeBjörn Gustavsson
When a SEQUENCE was defined inline inside extension addition group like this: InlinedSeq ::= SEQUENCE { ..., [[ s SEQUENCE { a INTEGER, b BOOLEAN } ]] } the decoding code would return the contents of the SEQUENCE in a record named 'InlinedSeq_ExtAddGroup1_s', while the record definition in the generated HRL file would be 'InlinedSeq_s'. Since there is no reason to use the longer record name (no risk for ambiguity), correct the name in the decoding code.
2013-06-07erts: Update spec in preloaded to reflect success typing (again)Lukas Larsson
2013-06-07crypto & public_key: Clearify documentation.Ingela Anderton Andin
2013-06-07ssl: Fix dialyzer warningsIngela Anderton Andin
2013-06-07ssl: Correct rebase mistakesIngela Anderton Andin
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-07UPER: Correct encoding of ENUMERATED with more than 63 extended valuesBjörn Gustavsson
2013-06-07Add asn1_test_lib:hex_to_bin/1Björn Gustavsson
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