aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Collapse)Author
2012-04-24Merge remote branch 'upstream/maint'Ingela Anderton Andin
* upstream/maint: Corrected ssh option handling
2012-04-24Merge branch 'ia/ssh/options-check-OTP-10061' into maintIngela Anderton Andin
* ia/ssh/options-check-OTP-10061: Corrected ssh option handling
2012-04-24Corrected ssh option handlingIngela Anderton Andin
The option ip_v6_disabled and the undocumented option exec was incorrectly handled by the option checking code. There where two options for allowing user interaction one documented and one undocumented, they where merge to to be the documented one. For backwards compatibility the undocumented one is transformed to the documented one in the option checking code.
2012-04-24Merge branch 'maint'Ingela Anderton Andin
* maint: Avoid sending two ssh close messages
2012-04-24Merge branch 'ia/ssh/close/OTP-10060' into maintIngela Anderton Andin
* ia/ssh/close/OTP-10060: Avoid sending two ssh close messages
2012-04-20Merge branch 'maint'Sverker Eriksson
2012-04-20Revert vsn.mk for crypto and private_keySverker Eriksson
Included them by "mistake".
2012-04-20Merge branch 'sverk/crypto-rsa-key-opt' into maintSverker Eriksson
* sverk/crypto-rsa-key-opt: public_key: Use optimized RSA private key handling crypto: Optimize RSA private key handling crypto: Remove unnecessary dependency to libssl OTP-10064 OTP-10065
2012-04-20public_key: Use optimized RSA private key handlingSverker Eriksson
by providing extra redundant information to crypto.
2012-04-20crypto: Optimize RSA private key handlingSverker Eriksson
by using extra redundant information as part of the key that will speed things up for OpenSSL. Affects rsa_sign, rsa_private_encrypt and rsa_private_decrypt.
2012-04-20Avoid sending two ssh close messagesIngela Anderton Andin
2012-04-18Merge branch 'maint'Patrik Nyblom
Conflicts: lib/hipe/cerl/erl_bif_types.erl
2012-04-18Revert "Extend erlang:port_info/1,2 to show the OS pid of a spawned process"Patrik Nyblom
This reverts commit d4667d383964c1550e0a91d64b674e84f6d07e3b. This commit was included by mistake, the correct patch will be merged from maint.
2012-04-17doc: Add 'is' to explanation of callback modulesBjörn-Egil Dahlberg
2012-04-17doc: Fix typo in inetBjörn-Egil Dahlberg
2012-04-17Correct documentation, erl_bif_types and dialyzer testsPatrik Nyblom
2012-04-17Extend erlang:port_info/1,2 to show the OS pid of a spawned processMatthias Lang
When spawning OS (unix) processes with erlang:open_port, store the resulting unix pid so that it can be queried later on using erlang:port_info/1,2.
2012-04-16kernel, erts: Remove bit8 option from inetBjörn-Egil Dahlberg
2012-04-16Merge branch 'maint'Björn-Egil Dahlberg
2012-04-16Merge branch 'egil/inet-document-options/OTP-10053' into maintBjörn-Egil Dahlberg
* egil/inet-document-options/OTP-10053: kernel: Document ifaddr option kernel: Document tcp-, udp- and sctp_module option kernel: Remove bit8 option in spec kernel: Document bit8 option in inet:setopts/2 kernel: Initial doc of forgotten inet options
2012-04-16kernel: Document ifaddr optionBjörn-Egil Dahlberg
* same as ip option
2012-04-16kernel: Document tcp-, udp- and sctp_module optionBjörn-Egil Dahlberg
2012-04-16kernel: Remove bit8 option in specBjörn-Egil Dahlberg
* The option is removed to force warnings for dialyzer
2012-04-13kernel: Document bit8 option in inet:setopts/2Björn-Egil Dahlberg
* This is a highly specialized option which is probably not used and will be removed in R16
2012-04-13Merge branch 'maint'Gustav Simonsson
2012-04-12eldap: Update .gitignoreBjörn-Egil Dahlberg
2012-04-12kernel: Initial doc of forgotten inet optionsBjörn-Egil Dahlberg
* UDP: ulticast_if, multicast_loop and multicast_ttl, add_membership and drop_membership * Inet: bit8, buffer, deliver, high_watermark, linger and low_watermark
2012-04-11crypto: Remove unnecessary dependency to libsslSverker Eriksson
crypto only uses libcrypto. Superfluous dependency introduced in R14B04 by 52230a417ad0057.
2012-04-03Update version numbers for R15B02 devBjörn-Egil Dahlberg
2012-04-03Merge commit 'OTP_R15B01'Björn-Egil Dahlberg
2012-04-01Prepare releaseOTP_R15B01Erlang/OTP
2012-03-30Merge remote branch 'upstream/maint'Peter Andersson
2012-03-30Merge branch 'peppe/common_test/otp-10039' into maintPeter Andersson
* peppe/common_test/otp-10039: Document the new timetrap interface
2012-03-30Document the new timetrap interfacePeter Andersson
OTP-10039
2012-03-30Merge branch 'maint'Björn-Egil Dahlberg
2012-03-30Update copyright yearsBjörn-Egil Dahlberg
2012-03-30Merge branch 'maint'Gustav Simonsson
2012-03-30Merge branch 'gustav/sasl/release-handler-test-fix-temp' into maintGustav Simonsson
* gustav/sasl/release-handler-test-fix-temp: Moved test case to avoid a conflict between test cases. Temporarily fix for R15B01.
2012-03-30Merge branch 'maint'Siri Hansen
2012-03-30Merge branch 'siri/crashdump_viewer/create_r14b_dump/OTP-10032' into maintSiri Hansen
* siri/crashdump_viewer/create_r14b_dump/OTP-10032: [crashdump_viewer] Add case clause for testing with dump from R14B
2012-03-30[crashdump_viewer] Add case clause for testing with dump from R14BSiri Hansen
2012-03-30Merge branch 'maint'Siri Hansen
2012-03-30Merge branch 'siri/reltool/dialyzer/OTP-10035' into maintSiri Hansen
* siri/reltool/dialyzer/OTP-10035: [reltool] Fix dialyzer warnings for R15B01
2012-03-30Merge branch 'maint'Gustav Simonsson
2012-03-30Merge branch 'ta/docs-maint' into maintGustav Simonsson
* ta/docs-maint: Fix typos in ct getting_started_chapter.xml Fix typos in driver.xml and erl_driver.xml Fix typos in INSTALL-WIN32.md OTP-10037
2012-03-30Merge branch 'maint'Dan Gudmundsson
2012-03-30[eldap] Fix docsDan Gudmundsson
Fix copy paste errors
2012-03-30Merge branch 'dgud/wx/misc-improvements/OTP-9947' into maintDan Gudmundsson
* dgud/wx/misc-improvements/OTP-9947: [wx] Fix list in list in list specs
2012-03-29Merge branch 'kenneth/asn1/integer_range/OTP-9946' into maintKenneth Lundin
* kenneth/asn1/integer_range/OTP-9946: replace 5 sec timeout (too short) with monitor in asn1_db requests Correct handling of INTEGER (1..4 | 8 | 10 | 20)
2012-03-29replace 5 sec timeout (too short) with monitor in asn1_db requestsKenneth Lundin
This bug was introduced as part of the parallelization of test suites and is notpart of any released version