aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-06-11Merge branch 'maint'Anders Svensson
2013-06-11Merge branch 'anders/diameter/request_spawn/OTP-11060' into maintAnders Svensson
* anders/diameter/request_spawn/OTP-11060: Minor doc fix
2013-06-11Minor doc fixAnders Svensson
2013-06-11Merge branch 'maint'Anders Svensson
2013-06-11Merge branch 'anders/diameter/release/R16B01/OTP-11120' into maintAnders Svensson
* anders/diameter/release/R16B01/OTP-11120: vsn -> 1.4.2 Update appup for R16B01 Trailing whitespace and copyright fixes Minor macro simplification Move app/appsrc from src/base into src
2013-06-11Merge branch 'anders/diameter/request_spawn/OTP-11060' into maintAnders Svensson
* anders/diameter/request_spawn/OTP-11060: Make spawn options for request processes configurable
2013-06-11Merge branch 'anders/diameter/peer_address_config/OTP-10893' into maintAnders Svensson
* anders/diameter/peer_address_config/OTP-10893: Let diameter_{tcp,sctp} be configured with permissible remote addresses Fix diameter_{tcp,sctp} spec Remove trailing whitespace
2013-06-10vsn -> 1.4.2Anders Svensson
2013-06-10Update appup for R16B01Anders Svensson
Tickets and corresponding runtime modules, in order merged: OTP-9610 (distribution) diameter diameter_config diameter_peer diameter_service diameter_traffic diameter_service must precede diameter_peer. OTP-10972 (app_not_configured) diameter diameter_config diameter_lib diameter_peer_fsm diameter_watchdog Load order is unimportant. OTP-11017 (service_config) diameter_config OTP-10986 (address_config) diameter_peer diameter_peer_fsm diameter_tcp diameter_tcp must follow the others. OTP-11019 (watchdog_leak) diameter_service OTP-11026 (avp_length_failure) diameter_codec OTP-11007 (avp_decode) diameter_gen.hrl => diameter_gen_* diameter_codec diameter_traffic diameter_traffic must precede diameter_gen_*. OTP-11087 (missed_5001) diameter_gen.hrl => diameter_gen_* OTP-11115 (watchdog_function_clause) diameter_watchdog OTP-11050 (inband_security) diameter_peer_fsm diameter_capx This order is required. OTP-11045 (host_ip_address) diameter_peer_fsm OTP-11092 (5xxx_failed_avp) diameter_traffic OTP-11127 (one_failed_avp) diameter_peer_fsm OTP-10893 (peer_address_config) diameter_peer diameter_tcp diameter_sctp diameter_peer must precede the others. OTP-11060 (request_spawn) diameter_service diameter_traffic diameter_config diameter diameter_traffic should precede diameter_service, diameter_config should follow. Tickets without code: OTP-10903 (examples_suite) OTP-11014 (release_notes) OTP-11051 (mkdir_race) OTP-10914 (timetraps)
2013-06-10Merge branch 'maint'Rickard Green
* maint: erts: Fix warning erts: Fix management of redirected carrier to deallocate
2013-06-10Merge branch 'rickard-sverker/carrier-migration/OTP-10279' into maintRickard Green
* rickard-sverker/carrier-migration/OTP-10279: erts: Fix warning erts: Fix management of redirected carrier to deallocate
2013-06-10Make spawn options for request processes configurableAnders Svensson
That is, for the process that's spawned for each incoming Diameter request message.
2013-06-10Merge branch 'maint'Sverker Eriksson
2013-06-10Forgot ticket for sverk/darwin-unlimited-selectSverker Eriksson
OTP-11159
2013-06-10Merge branch 'sverk/darwin-unlimited-select' into maintSverker Eriksson
* sverk/darwin-unlimited-select: erts: Fix dynamic select for darwin erts: Refactor unlimited select patch erts: Fix bug in unlimited fd_set patch Use _DARWIN_UNLIMITED_SELECT in erl_poll
2013-06-10Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-06-10Merge branch 'ia/public_key/crypto/prepare-for-release' into maintIngela Anderton Andin
* ia/public_key/crypto/prepare-for-release: public_key & ssl: Add ASN-1 dependency crypto & public_key: prepare for release
2013-06-10Merge branch 'ia/crypto/avoid-too-big-binaries/OTP-11142' into maintIngela Anderton Andin
* ia/crypto/avoid-too-big-binaries/OTP-11142: Teach crypto.c not to call enif_compute_timeslice with 0 Add enif_consume_timeslice to appropriate crypto NIFs crypto: Add large test data crypto: Avoid big binaries in nifs Crypto: Structure code
2013-06-10Merge branch 'maint'Rickard Green
* maint: Fix bad fix of erts_stale_drv_select()
2013-06-10Merge branch 'rickard/stale-driver-select/OTP-11084' into maintRickard Green
* rickard/stale-driver-select/OTP-11084: Fix bad fix of erts_stale_drv_select()
2013-06-10Fix bad fix of erts_stale_drv_select()Rickard Green
2013-06-10Merge branch 'maint'Rickard Green
* maint: erts: Fix debug code in erts_ptab_test_next_id()
2013-06-10erts: Fix debug code in erts_ptab_test_next_id()Rickard Green
2013-06-10erts: Fix warningRickard Green
2013-06-10erts: Fix management of redirected carrier to deallocateRickard Green
2013-06-10Merge branch 'maint'Raimo Niskanen
Conflicts: lib/kernel/src/inet_db.erl
2013-06-10Merge branch 'raimo/inet-gethostbyname-lowercase-search/OTP-10689' into maintRaimo Niskanen
* raimo/inet-gethostbyname-lowercase-search/OTP-10689: Add test cases for host lookup case (in)sensitivity Improve case (in)sensitivity for host lookups
2013-06-10Let diameter_{tcp,sctp} be configured with permissible remote addressesAnders Svensson
Option 'accept' allows remote addresses to be configured as tuples or regular expressions. The remote addresses for any incoming (aka accepted) connection/association are matched against the configured values, any non-matching address causing the connection/association to be aborted.
2013-06-10Fix diameter_{tcp,sctp} specAnders Svensson
The third argument to start/3 was just wrong.
2013-06-10Remove trailing whitespaceAnders Svensson
2013-06-10Trailing whitespace and copyright fixesAnders Svensson
2013-06-10Minor macro simplificationAnders Svensson
2013-06-10Move app/appsrc from src/base into srcAnders Svensson
2013-06-10Merge branch 'maint'Dan Gudmundsson
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 'maint'Fredrik Gustafsson
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 'maint'Lukas Larsson
* maint: erts: Update spec in preloaded to reflect success typing (again) Conflicts: erts/preloaded/ebin/erlang.beam
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 remote-tracking branch 'upstream/maint'Ingela Anderton Andin
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 'maint'Björn Gustavsson
* maint: PER/UPER: Correct decoding of SEQUENCEs with more than 64 extensions testConstraints: Improve tests of semi-constrained INTEGERs Test ENUMERATED with many extended values PER, UPER: Fix record name mismatch between HRL file and decoding code 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/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 'maint'Fredrik Gustafsson
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