summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [mnesia] Fixed sticky read lock bugDan Gudmundsson2011-12-063-33/+20
* [mnesia] Whitespace fixesDan Gudmundsson2011-12-0612-1353/+1353
* Merge branch 'ia/public_key/asn1'Ingela Anderton Andin2011-12-064-690/+66
|\
| * Asn1 simplificationIngela Anderton Andin2011-12-054-690/+66
* | Merge branch 'anders/diameter/transport_restart/OTP-9756'Anders Svensson2011-12-051-7/+2
|\ \
| * | Fix transport restart bugAnders Svensson2011-11-291-7/+2
* | | Merge branch 'rickard/generic-thr-queue/OTP-9632'Rickard Green2011-12-051-1/+2
|\ \ \
| * | | Fix handle_async_ready_clean()Rickard Green2011-12-051-1/+2
* | | | Merge branch 'master' of super:otpMicael Karlberg2011-12-053-21/+289
|\ \ \ \
| * \ \ \ Merge branch 'sverk/crypto-sha256'Sverker Eriksson2011-12-053-21/+289
| |\ \ \ \
| | * | | | crypto: Add sha256,384,512 in documentation for rsa_verifySverker Eriksson2011-12-051-1/+3
| | * | | | crypto: Add sha{256,384,512} to rsa_verifySverker Eriksson2011-11-302-16/+64
| | * | | | crypto: Add sha256 and sha512Sverker Eriksson2011-11-302-4/+222
* | | | | | Add proper release notes for ticket OTP-9779.Micael Karlberg2011-12-053-27/+42
|/ / / / /
* | | | | Merge branch 'sa/dialyzer-fixes'Henrik Nord2011-12-0510-57/+78
|\ \ \ \ \
| * | | | | Correct callback spec in application moduleStavros Aronis2011-12-011-1/+1
| * | | | | Refine warning about callback specs with extra rangesStavros Aronis2011-12-012-5/+7
| * | | | | Cleanup autoimport compiler directivesStavros Aronis2011-12-011-19/+15
| * | | | | Fix Dialyzer's warnings in typerStavros Aronis2011-12-011-2/+2
| * | | | | Fix Dialyzer's warning for its own codeStavros Aronis2011-12-011-6/+7
| * | | | | Fix bug in Dialyzer's behaviours analysisStavros Aronis2011-12-013-2/+21
| * | | | | Fix crash in DialyzerStavros Aronis2011-12-013-22/+25
* | | | | | Merge branch 'ia/ssl/test-cases-maint2'Ingela Anderton Andin2011-12-051-2/+2
|\ \ \ \ \ \
| * | | | | | Added tcp_delivery_workaround to the test case invalid_signature_serverIngela Anderton Andin2011-12-051-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'lukas/common_test/reverse_hook_order/OTP-9774'Lukas Larsson2011-12-053-19/+38
|\ \ \ \ \ \
| * | | | | | Reverse hook order for *_end_per_* hooksLukas Larsson2011-11-293-19/+38
* | | | | | | Merge branch 'lars/orber/ssl-options/OTP-9773'Lars Thorsen2011-12-0510-1617/+2119
|\ \ \ \ \ \ \
| * | | | | | | [orber] Change the option handling for sslLars Thorsen2011-12-0510-1617/+2119
* | | | | | | | Merge branch 'lars/erl_docgen/arity-calculation-bug/OTP-9772'Lars Thorsen2011-12-053-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | [erl_docgen] Fix arity calculation bugLars Thorsen2011-12-053-3/+3
|/ / / / / / /
* | | | | | | Merge branch 'bmk/inets/inets58_integration2'Micael Karlberg2011-12-052-0/+17
|\ \ \ \ \ \ \
| * | | | | | | Add proper release notes entry for OTP-9628.Micael Karlberg2011-12-052-0/+17
* | | | | | | | Merge branch 'sverk/deprecate-nif-reload'Sverker Eriksson2011-12-052-16/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | erts: Deprecate the NIF reload mechanismSverker Eriksson2011-11-292-16/+30
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'bjorn/test-cases'Björn Gustavsson2011-12-057-49/+92
|\ \ \ \ \ \ \ \
| * | | | | | | | lcnt_SUITE: Be kind to slow machinesBjörn Gustavsson2011-12-021-1/+2
| * | | | | | | | crypto_SUITE: Reinstate what was "lost in translation"Björn Gustavsson2011-12-021-25/+21
| * | | | | | | | fileTransferSUITE: Cope with missing/broken crypto applicationBjörn Gustavsson2011-12-021-3/+12
| * | | | | | | | sensitive_SUITE: Fix spuriously failing recv_trace/1Björn Gustavsson2011-12-021-2/+1
| * | | | | | | | eprof_SUITE: Cope with fast computers and bad time measurementsBjörn Gustavsson2011-12-021-2/+8
| * | | | | | | | cover_SUITE: Cope with missing/broken crypto applicationBjörn Gustavsson2011-12-021-5/+21
| * | | | | | | | otp_SUITE: Write log files about undefined functions and so onBjörn Gustavsson2011-12-021-11/+27
* | | | | | | | | erts: Remove duplicate erts_unblock_fpeJovi Zhang2011-12-051-1/+0
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch 'ia/ssl/dialyzer-R15'Ingela Anderton Andin2011-12-056-64/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Callback specs now handled by -callback directive in the behaviour module.Ingela Anderton Andin2011-12-016-64/+11
* | | | | | | | | Merge branch 'siri/sasl/improve-doc/OTP-9294'Siri Hansen2011-12-056-306/+96
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add all valid report types in documentation of rb:listSiri Hansen2011-12-021-2/+4
| * | | | | | | | | Fix minor faults in documentation of release handlingSiri Hansen2011-12-014-296/+84
| * | | | | | | | | Rename create_target.xml to create_target.xmlsrc to prepare for codeincludeSiri Hansen2011-12-012-31/+31
* | | | | | | | | | Merge branch 'hb/kernel/too_greedy_disk_log/OTP-9764'Hans Bolinder2011-12-051-23/+28
|\ \ \ \ \ \ \ \ \ \