aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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 '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 '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 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 '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 '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 'fredrik/ssh/appup_r16b01' into maintFredrik Gustafsson
* fredrik/ssh/appup_r16b01: ssh: appup changes
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 '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 '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-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 'egil/increase-eprof-usability/OTP-11144' into maintBjörn-Egil Dahlberg
* egil/increase-eprof-usability/OTP-11144: tools: Document new eprof options tools: Add options to eprof tools: Add testcase to eprof_SUITE tools: Refactor away ?line macro in eprof_SUITE
2013-06-05Merge branch 'jv/erl_lint-default_types/OTP-11143' into maintFredrik Gustafsson
* jv/erl_lint-default_types/OTP-11143: Updated primary bootstrap stdlib: re-factored erl_lint.erl Improve erl_lint performance
2013-06-05ssh: appup changesFredrik Gustafsson
2013-06-05mnesia: Fix (timing issue) testcaseDan Gudmundsson
2013-06-05ssl: Prepare for releaseIngela Anderton Andin
2013-06-05Merge branch 'ia/ssl/prep-dtls' into maintIngela Anderton Andin
* ia/ssl/prep-dtls: ssl: Structural perarparation to support DTLS ssl: Rename ssl_certificate_db to ssl_pkix_db for clarity
2013-06-05Merge branch 'fredrik/tools/emacs_bifs' into maintFredrik Gustafsson
* fredrik/tools/emacs_bifs: tools: Added gather_gc_info_result to bifs
2013-06-04ssl: Structural perarparation to support DTLSIngela Anderton Andin
Also phase in tls module as main API instead of ssl. To make API clearer. As TLS is the new protocol name. Maybe keep some API functions in ssl
2013-06-04ssl: Rename ssl_certificate_db to ssl_pkix_db for clarityIngela Anderton Andin
Conflicts: lib/ssl/src/ssl.app.src lib/ssl/src/ssl_manager.erl
2013-06-04Merge branch 'rickard-sverker/carrier-migration/OTP-10279' into maintRickard Green
* rickard-sverker/carrier-migration/OTP-10279: stdlib: Fix ets_SUITE memory tests
2013-06-04stdlib: Fix ets_SUITE memory testsRickard Green
Need to take 'mbcs_pool' into account.
2013-06-04Merge remote branch 'origin/peppe/common_test/remove_end_per_tc_warning' ↵Peter Andersson
into maint * origin/peppe/common_test/remove_end_per_tc_warning: Remove incorrect warning about missing end_per_testcase OTP-11052
2013-06-04Merge remote branch 'origin/peppe/common_test/ct_conn_handling' into maintPeter Andersson
* origin/peppe/common_test/ct_conn_handling: Add test suite Fix faulty connection handling OTP-10126
2013-06-04mnesia: Fix unsubscribe error handlingDan Gudmundsson
2013-06-04Merge branch 'ia/crypto/tests' into maintIngela Anderton Andin
* ia/crypto/tests: crypto: Document enhancement crypto: Test suite completeness
2013-06-04tools: Added gather_gc_info_result to bifsFredrik Gustafsson