aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-12-28Move periods inside parenthetical sentencesTom Benner
2014-12-27Add an apostrophe to contractions of "let us"Tom Benner
2014-12-26Fix grammarDerek Brown
2014-12-22Merge branch 'mikpe/fix-eacces-spelling' into maintBruce Yinhe
* mikpe/fix-eacces-spelling: fix eacces spelling
2014-12-19debugger: Fix debugger save options on macDan Gudmundsson
wxFileDialog:getPaths(FD) always return the empty list on mac when using file dialog.
2014-12-19Merge branch 'hans/eldap/bad_return_close/OTP-12349' into maintHans Nilsson
* hans/eldap/bad_return_close/OTP-12349: eldap: Remove trailing white space. eldap: Test cases for a few return values (open, close) eldap: updated eldap:close in tests eldap: Makes close/1 return as documented.
2014-12-19Merge branch 'hans/eldap/test_improvents/OTP-12355' into maintHans Nilsson
* hans/eldap/test_improvents/OTP-12355: eldap: Corrects SSL over IPv6 test. eldap: Removes eldap_misc_SUITE that is now included in eldap_basic_SUITE. eldap: Add encode/decode tests. eldap: Merge eldap_connections_SUITE into eldab_basic_SUITE eldap: Adds ssl to connections test suite eldap: Updates basic test suite - Splits one large testcase into smaller ones. - Makes tests independent - Adds some tests.
2014-12-19wx: Do not crash server when going downDan Gudmundsson
If a connect request was made during the takedown of wx it would crash.
2014-12-18Merge branch 'haguenau/fix-endianness-speling' into maintBruce Yinhe
* haguenau/fix-endianness-speling: Replaced "Endianess" with "Endianness" everywhere
2014-12-17eldap: Remove trailing white space.Hans Nilsson
2014-12-17eldap: Test cases for a few return values (open, close)Hans Nilsson
2014-12-17eldap: updated eldap:close in testsHans Nilsson
2014-12-17eldap: Makes close/1 return as documented.Hans Nilsson
2014-12-17eldap: Corrects SSL over IPv6 test.Hans Nilsson
2014-12-17eldap: Removes eldap_misc_SUITE that is now included in eldap_basic_SUITE.Hans Nilsson
2014-12-17eldap: Add encode/decode tests.Hans Nilsson
2014-12-17eldap: Merge eldap_connections_SUITE into eldab_basic_SUITEHans Nilsson
2014-12-17 eldap: Adds ssl to connections test suiteHans Nilsson
2014-12-17eldap: Updates basic test suiteHans Nilsson
- Splits one large testcase into smaller ones. - Makes tests independent - Adds some tests.
2014-12-17Merge branch 'ia/ssh/ssh-connection-protocol-timeout/OTP-12004' into maintIngela Anderton Andin
* ia/ssh/ssh-connection-protocol-timeout/OTP-12004: ssh: Improve errorhandling in ssh_connection.erl
2014-12-17ssh: Improve errorhandling in ssh_connection.erlIngela Anderton Andin
If a channel is closed by the peer while using a function with call semantics in ssh_connection.erl return {error, closed}. Document that the functions can return {error, timeout | closed} and not only ssh_request_status()
2014-12-17Merge branch 'marcus/revert-ssh-testcase2/OTP-12004' into maintMarcus Arendt
* marcus/revert-ssh-testcase2/OTP-12004: fix failed conflict resolution
2014-12-12Merge branch 'hans/eldap/doc_fixes/OTP-12354' into maintHans Nilsson
2014-12-12Merge branch 'marcus/fix-eldap-notes' into maintMarcus Arendt
* marcus/fix-eldap-notes: add missing release notes
2014-12-12add missing release notesMarcus Arendt
2014-12-11tools: Fix lcnt printout of histogramsBjörn-Egil Dahlberg
2014-12-11tools: Fix lcnt sort of inspected locksBjörn-Egil Dahlberg
An error was introduced in commit f24d1ad9004b2885cd3b15ac0bf9d1407ca68bc8 which reversed the sorting of all locks. This meant that the least contended locks was printed instead of the most contended. This commit reverses the reverse.
2014-12-11Fix compile breakage on OpenBSDAlex Wilson
Some of the structs and functions needed by memsup.c are in vmmeter.h on OpenBSD, too.
2014-12-10Merge branch 'rickard/atomic64/OTP-12351' into maintRickard Green
* rickard/atomic64/OTP-12351: Use the new 64-bit atomic ops API Introduce a 64-bit atomic ops API
2014-12-10Use the new 64-bit atomic ops APIRickard Green
2014-12-10Introduce a 64-bit atomic ops APIRickard Green
The 64-bit atomic ops API is implemented by * native word size atomic ops on 64-bit architectures, and * native double word size atomic ops on 32-bit architectures when available. When native double word size atomic is not available, the fallback using modification counters is used.
2014-12-10fix failed conflict resolutionMarcus Arendt
2014-12-09Updated OTP versionOTP-17.4Erlang/OTP
2014-12-09Prepare releaseErlang/OTP
2014-12-09Update preloaded modulesMarcus Arendt
2014-12-09Update primary bootstrapMarcus Arendt
2014-12-09Merge remote-tracking branch 'upstream/maint' into maintHans Nilsson
2014-12-09Merge branch 'hans/ssh/fix_app_appup' into maintHans Nilsson
* hans/ssh/fix_app_appup: ssh: Fix syntax error in .appup
2014-12-09ssh: Fix syntax error in .appupHans Nilsson
2014-12-09Merge branch 'marcus/revert-ssh-testcase/OTP-12004' into maintMarcus Arendt
* marcus/revert-ssh-testcase/OTP-12004: revert ssh testcase
2014-12-09revert ssh testcaseMarcus Arendt
2014-12-09Merge branch 'dgud/debugger/still-invoked-gs-functions/OTP-12357' into maintDan Gudmundsson
* dgud/debugger/still-invoked-gs-functions/OTP-12357: debugger: Do not use the old removed gs functionality
2014-12-08Fix inet:getopts involving #sctp_paddrinfo{}Simon Cornish
Handle peer addresses that are unconfirmed (i.e. in state SCTP_UNCONFIRMED). Handle unknown states instead of using ASSERT
2014-12-08eldap: Clarifies documentation for start_tls and searchHans Nilsson
2014-12-08Merge branch 'hans/ssh/fix_app_appup' into maintHans Nilsson
* hans/ssh/fix_app_appup: ssh: Fix .app and .appup
2014-12-08ssh: Fix .app and .appupHans Nilsson
2014-12-08Merge branch 'rickard/appup-files/OTP-12358' into maintRickard Green
* rickard/appup-files/OTP-12358: Add .appup file
2014-12-08Add .appup fileRickard Green
2014-12-08Merge branch 'rickard/autoconf/OTP-12348' into maintRickard Green
* rickard/autoconf/OTP-12348: Update megaco.appup.src
2014-12-08Update megaco.appup.srcRickard Green