aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-12-02Merge branch 'ia/inets/prep-for-release' into maintIngela Anderton Andin
* ia/inets/prep-for-release: inets: Prepare for release
2014-12-02Merge branch 'ia/ssl/dialyzer/OTP-12341' into maintIngela Anderton Andin
* ia/ssl/dialyzer/OTP-12341: ssl: Prepare for release ssl: Change code to reflect that state data may be secret
2014-12-02Merge branch 'raimo/snmp/compiler/allow_refinement_of_opaque/17/OTP-12066' ↵Raimo Niskanen
into maint * raimo/snmp/compiler/allow_refinement_of_opaque/17/OTP-12066: [snmp/compiler] Refinement of type Opaque was not allowed MIB constructs such as "SYNTAX Opaque (SIZE(0..65535))" was previously not allowed, this has now been fixed. See the standard ALARM-MIB for eaxmple.
2014-12-01ssl: Prepare for releaseIngela Anderton Andin
2014-12-01ssl: Change code to reflect that state data may be secretIngela Anderton Andin
2014-12-01inets: Prepare for releaseIngela Anderton Andin
2014-12-01Merge branch 'hans/ssh/appup' into maintHans Nilsson
* hans/ssh/appup: ssh: prepares appup file for release
2014-12-01ssh: prepares appup file for releaseHans Nilsson
2014-12-01Merge branch 'anders/diameter/filters/OTP-12308' into maintAnders Svensson
* anders/diameter/filters/OTP-12308: Order peers in pick_peer callbacks
2014-12-01Merge branch 'anders/diameter/connect_timer/OTP-12281' into maintAnders Svensson
* anders/diameter/connect_timer/OTP-12281: Tweak reason in closed event Fix ignored connect timer Check {connect,watchdog}_timer distinction in event testcases Rename reconnect_timer to connect_timer in examples and suites
2014-12-01Merge branch 'anders/diameter/3xxx/OTP-12233' into maintAnders Svensson
* anders/diameter/3xxx/OTP-12233: Fix handling of 3xxx Result-Code without E-bit
2014-12-01Merge branch 'anders/diameter/request_leak/OTP-12196' into maintAnders Svensson
* anders/diameter/request_leak/OTP-12196: Fix remote diameter_request table leak
2014-12-01Merge branch 'raimo/snmp/dev' into maintRaimo Niskanen
* raimo/snmp/dev: Try to increase test case timeouts Honor bind_to for manager net_if family inet
2014-12-01[snmp/compiler] Refinement of type Opaque was not allowedMicael Karlberg
MIB constructs such as "SYNTAX Opaque (SIZE(0..65535))" was previously not allowed, this has now been fixed. See the standard ALARM-MIB for eaxmple.
2014-12-01Merge branch 'hans/ssh/tar_read_and_crypto/OTP-12312' into maintHans Nilsson
* hans/ssh/tar_read_and_crypto/OTP-12312: ssh: Implements and tests erl_tar read from remote host. ssh: crypto framework for ssh_sftp:open_tar added
2014-12-01ssh: Implements and tests erl_tar read from remote host.Hans Nilsson
2014-12-01ssh: crypto framework for ssh_sftp:open_tar addedHans Nilsson
2014-12-01Merge branch 'vinoski/rm-foo-dtrace' into maintMarcus Arendt
* vinoski/rm-foo-dtrace: Clean up temporary dtrace file during config
2014-12-01Merge branch 'ia/ssh/gracefull-termination/OTP-12185' into maintIngela Anderton Andin
* ia/ssh/gracefull-termination/OTP-12185: ssh: Gracefully handle bad input
2014-11-28Merge branch 'hans/eldap/timout_connect/OTP-12311' into maintHans Nilsson
* hans/eldap/timout_connect/OTP-12311: eldap: Fix timeout missing in ssl:connect
2014-11-27eldap: Fix timeout missing in ssl:connectHans Nilsson
2014-11-27Merge branch 'siri/gen_server/try-catch/OTP-12263' into maintSiri Hansen
* siri/gen_server/try-catch/OTP-12263: Add spec for gen_server:terminate/6,7
2014-11-27Order peers in pick_peer callbacksAnders Svensson
The order of peers presented to a diameter_app(3) pick_peer callback has previously not been documented, but there are use cases that are simplified by an ordering. For example, consider preferring a direct connection to a specified Destination-Host/Realm to any host in the realm. The implementation previously treated this as a special case by placing matching hosts at the head of the peers list, but the documentation made no guarantees. Now present peers in match-order, so that the desired sorting is the result of the following filter. {any, [{all, [host, realm]}, realm]} The implementation is not backwards compatible in the sense that a realm filter alone is no longer equivalent in this case. However, as stated, the documentation never made any guarantees regarding the sorting.
2014-11-27Merge branch 'dgud/asn1/fix-seqtag/OTP-12326' into maintDan Gudmundsson
* dgud/asn1/fix-seqtag/OTP-12326: asn1: Fix EXTERNAL (1994 variant) type conversion
2014-11-27Merge branch 'josevalim/jv-cover-last-expr-maint/OTP-12328' into maintMarcus Arendt
* josevalim/jv-cover-last-expr-maint/OTP-12328: Fix cover bug on last expressions with empty clauses
2014-11-27Merge branch 'mururu/typespec-doc-about-function/OTP-12327' into maintMarcus Arendt
* mururu/typespec-doc-about-function/OTP-12327: Add infometion about function()
2014-11-26Merge branch 'sverk/port_get_data-race/OTP-12208' into maintSverker Eriksson
* sverk/port_get_data-race/OTP-12208: erts: Fix port data memory allocation bug
2014-11-26asn1: Fix EXTERNAL (1994 variant) type conversionDan Gudmundsson
Missed to add seqtag handling for EXTERNAL type conversion, bug introduced in c266196c016fc1156c7a18cfeec4920ee4075519
2014-11-26Clean up temporary dtrace file during configSteve Vinoski
When configuring erts to support dynamic trace via dtrace, be sure to clean up the temporary file "erts/foo-dtrace.h" used to help check for dtrace support. Otherwise, it shows up as an untracked file in git.
2014-11-26Merge branch 'rickard/libatomic_ops_improvements/OTP-12302' into maintRickard Green
* rickard/libatomic_ops_improvements/OTP-12302: Improve documentation about atomic operations
2014-11-26Improve documentation about atomic operationsRickard Green
2014-11-26Merge branch 'dotsimon/asn1_automatic_tags/OTP-12318' into maintMarcus Arendt
* dotsimon/asn1_automatic_tags/OTP-12318: Fix IMPLICIT tagging when TagDefault is AUTOMATIC Add test for IMPLICIT tagging when TagDefault is AUTOMATIC
2014-11-26Merge branch 'nox/read_file_info-raw/OTP-12325' into maintLukas Larsson
* nox/read_file_info-raw/OTP-12325: kernel: Do not check unsync:ed file size Introduce new option 'raw' in file_info functions
2014-11-26Merge branch 'dgud/mnesia/match_object_bug/OTP-12304' into maintDan Gudmundsson
* dgud/mnesia/match_object_bug/OTP-12304: mnesia: Fix match_object bug
2014-11-26Merge branch 'dgud/testcasecuddling' into maintDan Gudmundsson
* dgud/testcasecuddling: stdlib: Fix timing issue in testcase
2014-11-26Merge branch 'RumataEstor/odbc-sign-bug' into maintMarcus Arendt
* RumataEstor/odbc-sign-bug: add odbc:start/stop in testcase Fix signedness bug Fix odbcserver warnings Delete odbcserver unused variables Test to reveal odbcserver protocol bug
2014-11-25Merge branch 'rickard/maint-17/activate-runq/OTP-12287' into maintRickard Green
* rickard/maint-17/activate-runq/OTP-12287: Do not let non-empty run-queue prevent activation of scheduler
2014-11-25Merge branch 'rickard/ppc32-atomic-opt/OTP-12250' into maintRickard Green
* rickard/ppc32-atomic-opt/OTP-12250: Optimize atomic ops with release barrier for 32-bit PowerPC
2014-11-25Merge branch 'rickard/libatomic_ops_improvements/OTP-12302' into maintRickard Green
* rickard/libatomic_ops_improvements/OTP-12302: Implement support for double word atomics using libatomic_ops Improve usage of libatomic_ops for word size atomics
2014-11-25Merge branch 'sverk/cpool-search-improvement' into maintSverker Eriksson
OTP-12323 * sverk/cpool-search-improvement: erts: Add internal docs for super carrier and new cpool search. erts: Fix bug causing mbc to be deleted from cpool before it was inserted erts: Fix bug causing mbc removed from cpool to be used at pool entrance erts: Add pooled_list and traitor_list
2014-11-25erts: Fix port data memory allocation bugSverker Eriksson
for non-immediate port data >= sizeof(Eterm)*2 words.
2014-11-25Merge branch 'sverk/with-ssl-rpath/OTP-12316' into maintSverker Eriksson
* sverk/with-ssl-rpath/OTP-12316: erts,crypto: Add configure option --with-ssl-rpath
2014-11-25Merge branch 'garret-smith/gs-elf_format-typo' into maintBruce Yinhe
OTP-12322 * garret-smith/gs-elf_format-typo: Fix typo in llvm/elf_format.hrl
2014-11-25Merge branch 'lem/epmd_sd_notify/OTP-12321' into maintLukas Larsson
* lem/epmd_sd_notify/OTP-12321: epmd: Unify systemd autoconf macros usage epmd: Added systemd notify support to EPMD
2014-11-25kernel: Do not check unsync:ed file sizeLukas Larsson
2014-11-25Merge branch 'hb/dialyzer/fix_a_record_bug/OTP-12319' into maintHans Bolinder
* hb/dialyzer/fix_a_record_bug/OTP-12319: dialyzer: correct record updates
2014-11-24Fix IMPLICIT tagging when TagDefault is AUTOMATICSimon Cornish
This patch fixes a bug with compliance to X.680 (200811) s31.2.7 Basically, when TagDefault is AUTOMATIC then tags are IMPLICIT unless EXPLICIT is given.
2014-11-24epmd: Unify systemd autoconf macros usagePeter Lemenkov
Don't use both HAVE_SYSTEMD_DAEMON and HAVE_SYSTEMD_SD_DAEMON - use only the former one and remove the latter one entirely. Signed-off-by: Peter Lemenkov <[email protected]>
2014-11-24epmd: Added systemd notify support to EPMDPeter Lemenkov
Signed-off-by: Peter Lemenkov <[email protected]>
2014-11-24dialyzer: correct record updatesHans Bolinder
Correct a bug introduced in commit 8498a3.