aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-06-04ssl: Rename ssl_certificate_db to ssl_pkix_db for clarityIngela Anderton Andin
Conflicts: lib/ssl/src/ssl.app.src lib/ssl/src/ssl_manager.erl
2013-06-04Merge branch 'ia/crypto/tests' into maintIngela Anderton Andin
* ia/crypto/tests: crypto: Document enhancement crypto: Test suite completeness
2013-06-04Merge branch 'nox/erl_pp-callback/OTP-11140' into maintFredrik Gustafsson
* nox/erl_pp-callback/OTP-11140: Update primary bootstrap Support callback attributes in erl_pp
2013-06-04Merge branch 'sverk/pwrite-bug' into maintSverker Eriksson
* sverk/pwrite-bug: kernel: Fix bug in file:pwrite for large data sets
2013-06-04Merge branch 'sverk/core-chmodding' into maintSverker Eriksson
* sverk/core-chmodding: system: Prevent z_SUITE from changing the timestamp on core files
2013-06-04Merge branch 'rickard/stale-driver-select/OTP-11084' into maintRickard Green
* rickard/stale-driver-select/OTP-11084: Fix crash when reporting stale driver select
2013-06-04Merge branch 'rickard-sverker/carrier-migration/OTP-10279' into maintRickard Green
* rickard-sverker/carrier-migration/OTP-10279: erts: Document the +M<S>acul command line argument erts: Carrier pool information in allocator information erts: Use carrier pool for migration of carriers erts: Implement test case for carrier pool erts: Implement carrier pool erts: Fix type errors in info functions erts: Use Uint64 for call counts erts: Fix failing testcase alloc_SUITE:rbtree erts: Rename allocator aoffcbf to aoffcaobf erts: Remove unnecessary flag arguments in allocators erts: Remove SBMBC allocator erts: Add test for add_mbc and remove_mbc callbacks erts: Fix deallocation in removed carrier erts: Change naive list to rb-tree of carriers in AOFF allocator erts: Prepare aoff allocator for carrier migration erts: Make carrier header sizes customizable erts: Add "bestfit within carrier" for aoff allocator (aoffcbf)
2013-06-04erts: Document the +M<S>acul command line argumentRickard Green
2013-06-04erts: Carrier pool information in allocator informationRickard Green
That is, include information about carrier pool in result returned from erlang:system_info({allocator,allocator_sizes, _}).
2013-06-04erts: Use carrier pool for migration of carriersRickard Green
2013-06-04Merge branch 'siri/cuddle-with-tests' into maintSiri Hansen
* siri/cuddle-with-tests: Delete 'icky' dirs and symlinks after kernel tests [ct_netconfc] Improve error printout Fix interactive_shell_SUITE to handle node name with quotes
2013-06-04Delete 'icky' dirs and symlinks after kernel testsSiri Hansen
This is to avoid lingering files on windows.
2013-06-04[ct_netconfc] Improve error printoutSiri Hansen
2013-06-04Merge branch 'siri/cdv/memory-info/OTP-10604' into maintSiri Hansen
* siri/cdv/memory-info/OTP-10604: [observer] Add mbcs_pool to allocator info in system window [observer] Add mbcs_pool to allocator summary in crashdump_viewer observer: Improve initial call info observer: Add allocator info to gui [observer] Present Memory for each process in crashdump_viewer [observer] Add allocator summary in crashdump_viewer
2013-06-04[observer] Add mbcs_pool to allocator info in system windowSiri Hansen
2013-06-04[observer] Add mbcs_pool to allocator summary in crashdump_viewerSiri Hansen
2013-06-04beam_lib: Correct wrong type specificationBjörn Gustavsson
The function was updated in 5805b576, but not the type specificatin.
2013-06-04Merge branch 'bjorn/asn1/bug-fixes-and-clean-ups/OTP-11134' into maintBjörn Gustavsson
* bjorn/asn1/bug-fixes-and-clean-ups/OTP-11134: (77 commits) testSeqOf: Test constrained, extensible sizes Clean up testSeqOf Extend tests cases for BIT STRING Improve tests of ENUMERATED asn1ct_check: Eliminate useless Per argument from complist_as_tuple() asn1ct_check: Don't pass on #'ObjectClassFieldType'{} with fixed type asn1ct_gen_per: Remove useless renewal of 'enumval' Fix encoding of semi-constrained, extensible INTEGERs PER/UPER: Fix decoding of semi-constrained INTEGERs testPrim: Simplify test cases using a roundtrip function BER: Fix handling of a constructed default value for a class PER: Generate code for deep table constraints at compile-time Normalize data representation for table constraints asn1ct: Simplify check_value/2 Extend tests to cover more code in asn1ct_check Clean up checking of values for ENUMERATEDs Introduce a new mechanism for structured error handling asn1_db: Make dbput/3 and dbsave/2 asynchronous asn1_db: Remove unused functions asn1ct_check: Clean up checkc/3 ...
2013-06-04erts: Implement test case for carrier poolRickard Green
2013-06-04erts: Implement carrier poolRickard Green
2013-06-04erts: Fix type errors in info functionsRickard Green
2013-06-04erts: Use Uint64 for call countsRickard Green
2013-06-03erts: Fix failing testcase alloc_SUITE:rbtreeSverker Eriksson
2013-06-03Merge branch 'bmk/snmp/snmp424_integration/r16' into maintMicael Karlberg
2013-06-03Merge branch 'lukas/erts/cerl_gdb_extension/OTP-11130' into maintLukas Larsson
* lukas/erts/cerl_gdb_extension/OTP-11130: Add rcore and rgdb to cerl
2013-06-03Add rcore and rgdb to cerlLukas Larsson
These commands invoke gdb directly instead of going through emacs
2013-06-03Merge branch 'lukas/r16b01/testcase-fixes/OTP-11138' into maintLukas Larsson
* lukas/r16b01/testcase-fixes/OTP-11138: Do not fail if there is no variables file Run iter max ports on a seperate vm with smaller port table Set max ports for slave node Decrease sleep timer
2013-06-03Merge branch 'nox/erl_eval-receive/OTP-11137' into maintFredrik Gustafsson
* nox/erl_eval-receive/OTP-11137: Updated primary bootstrap for erl_eval Added preloaded prim_eval Fix receive support in erl_eval with a BEAM module
2013-06-03Merge branch 'epa/observer_state_view/OTP-11136' into maintFredrik Gustafsson
* epa/observer_state_view/OTP-11136: observer: corrected tip message observer: re-indetion of observer_procinfo.erl Add processes state view in observer
2013-06-03erts: Rename allocator aoffcbf to aoffcaobfSverker Eriksson
and add documentation in erts_alloc
2013-06-03erts: Remove unnecessary flag arguments in allocatorsSverker Eriksson
A cleanup after SBMBC was removed.
2013-06-03erts: Remove SBMBC allocatorSverker Eriksson
2013-06-03erts: Add test for add_mbc and remove_mbc callbacksSverker Eriksson
2013-06-03erts: Fix deallocation in removed carrierSverker Eriksson
2013-06-03erts: Change naive list to rb-tree of carriers in AOFF allocatorSverker Eriksson
and add new callbacks add_mbc(), remove_mbc() and largest_fblk_in_mbc() for carrier migration.
2013-06-03erts: Prepare aoff allocator for carrier migrationSverker Eriksson
by putting blocks from different carrier into separate search trees. Carriers are currently organized in a naive linked list by address order.
2013-06-03erts: Make carrier header sizes customizableSverker Eriksson
This is a modified partial revert of 2ab1d972f6fd37c17b05
2013-06-03erts: Add "bestfit within carrier" for aoff allocator (aoffcbf)Sverker Eriksson
2013-06-03Merge branch 'bjorn/compiler/fix-compiler-crash/OTP-11119' into maintBjörn Gustavsson
* bjorn/compiler/fix-compiler-crash/OTP-11119: compiler: Correct liveness optimization for wait/1
2013-06-03testSeqOf: Test constrained, extensible sizesBjörn Gustavsson
2013-06-03crypto: Document enhancementIngela Anderton Andin
2013-06-03crypto: Test suite completenessIngela Anderton Andin
2013-06-02Merge branch 'anders/diameter/one_failed_avp/OTP-11127' into maintAnders Svensson
* anders/diameter/one_failed_avp/OTP-11127: Adapt CEA/DPA Failed-AVP to RFC 6733
2013-06-02Merge branch 'anders/diameter/5xxx_failed_avp/OTP-11092' into maintAnders Svensson
* anders/diameter/5xxx_failed_avp/OTP-11092: Fix setting of Failed-AVP on {answer_message, 5xxx} from handle_request
2013-06-02Fix setting of Failed-AVP on {answer_message, 5xxx} from handle_requestAnders Svensson
RFC 6733 says that certain 5xxx result codes must be accompanied by Failed-AVP, and decode populates #diameter_packet.errors with Result-Code/AVP pairs for errors it detects. However, Failed-AVP was not set in the outgoing answer if the handle_request callback returned {answer_message, 5xxx}. It is now set with the AVP from the first pair with the specified Result-Code, if found. Note that {answer_message, 5xxx} doesn't handle all cases in which a 5xxx answer is required, only that in which the setting above is appropriate. If it isn't then handle_request should construct its answer and return {reply, Ans}.
2013-06-02Merge branch 'anders/diameter/host_ip_address/OTP-11045' into maintAnders Svensson
* anders/diameter/host_ip_address/OTP-11045: Respect Host-IP-Address configuration
2013-06-02Respect Host-IP-Address configurationAnders Svensson
Addresses returned from a transport module were always used to populate Host-IP-Address AVP's in an outgoing CER/CEA, which precluded the sending of a VIP address. Transport addresses are now only used if Host-IP-Address is unspecified. In other words, respect any configured Host-IP-Address, regardless of the physical addresses returned by the transport. To use the physical addresses, don't configure Host-IP-Address.
2013-06-02Merge branch 'anders/diameter/inband_security/OTP-11050' into maintAnders Svensson
* anders/diameter/inband_security/OTP-11050: Don't send default Inband-Security-Id in CER/CEA
2013-05-31Adapt CEA/DPA Failed-AVP to RFC 6733Anders Svensson
By setting only one, not many. The handling for other messages (except DWA, which is forgiving of errors) was dealt with in commit f7ec93e3.
2013-05-31Merge branch 'nox/fix-bs_put_string-renaming/OTP-11129' into maintFredrik Gustafsson
* nox/fix-bs_put_string-renaming/OTP-11129: Bootstrap Fix renaming of bs_put_string instructions