aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-02-25Merge branch 'siri/remove-overload/OTP-13184'Siri Hansen
* siri/remove-overload/OTP-13184: Remove module 'overload' from SASL
2016-02-25Merge branch 'maint'Ingela Anderton Andin
2016-02-25Merge branch 'legoscia/fix-ssl-example/PR-976/OTP-13363' into maintIngela Anderton Andin
* legoscia/fix-ssl-example/PR-976/OTP-13363: ssl: Modernize utility function Fix ssl example
2016-02-25Merge branch 'maint'Henrik Nord
2016-02-25Merge branch 'bernardd/gen_tcp_export_socket' into maintHenrik Nord
* bernardd/gen_tcp_export_socket: Export gen_tcp:socket() type OTP-13380
2016-02-25Merge branch 'maint'Henrik Nord
2016-02-25Merge branch 'kostis/hipe-icode-cleanup' into maintHenrik Nord
* kostis/hipe-icode-cleanup: Fix dialyzer warning and some code refactoring OTP-13379
2016-02-25Merge branch 'maint'Henrik Nord
2016-02-25Merge branch 'legoscia/crl-check-without-dp' into maintHenrik Nord
* legoscia/crl-check-without-dp: Be suspicious of certificates without CRL DPs Refactor ssl_crl_SUITE: extract crl_verify_error/6 OTP-13378
2016-02-25Merge branch 'legoscia/critical-extension-verify-none' into maintHenrik Nord
* legoscia/critical-extension-verify-none: ssl: with verify_none, accept critical extensions OTP-13377
2016-02-25Merge branch 'maint'Henrik Nord
2016-02-25Merge branch 'benwilson512/better-maps-with' into maintHenrik Nord
* benwilson512/better-maps-with: Improved maps:with/2 and maps:without/2 algorithm OTP-13376
2016-02-25Merge branch 'maint'Hans Nilsson
2016-02-25Merge branch 'hans/eldap/unbind/OTP-13327' into maintHans Nilsson
Conflicts: lib/eldap/src/eldap.erl
2016-02-25Merge branch 'hans/eldap/referral/OTP-12272' into maintHans Nilsson
2016-02-24Merge branch 'maint'Rickard Green
* maint: Do not wait for main lock when looking up process not running
2016-02-24Merge branch 'rickard/proc-not-running/OTP-13365' into maintRickard Green
* rickard/proc-not-running/OTP-13365: Do not wait for main lock when looking up process not running
2016-02-24Merge branch 'maint'Hans Bolinder
* maint: [erl_interface] Correct documentation
2016-02-24[erl_interface] Correct documentationHans Bolinder
Fix mistakes found by 'xmllint'.
2016-02-24Merge branch 'maint'Hans Bolinder
* maint: Update preloaded module typos Conflicts: erts/preloaded/ebin/prim_file.beam
2016-02-24Update preloaded moduleHans Bolinder
2016-02-23Do not wait for main lock when looking up process not runningRickard Green
2016-02-23ssl: Modernize utility functionIngela Anderton Andin
Use application:ensure_all_started/2 instead of hard coding dependencies
2016-02-23typosSverker Eriksson
2016-02-23Merge branch 'maint'Hans Nilsson
Conflicts: lib/ssh/test/ssh_upgrade_SUITE.erl
2016-02-23Merge branch 'hans/ssh/maint_cuddle_tests' into maintHans Nilsson
2016-02-23Merge branch 'dgud/observer/perf-freq'Dan Gudmundsson
* dgud/observer/perf-freq: observer: Optimize drawing of graphs observer: Make it possible to change the graphs Xaxis and update freq
2016-02-23Merge branch 'maint'Henrik Nord
Conflicts: OTP_VERSION
2016-02-23Merge branch 'maint-18' into maintHenrik Nord
2016-02-22eldap: experimental impl of controls in LDAPMessageHans Nilsson
2016-02-22Merge branch 'maint'Rickard Green
* maint: Improve cmpxchg8b/cmpxchg16b inline asm Improve cmpxchg8b inline asm configure test
2016-02-22Merge branch 'rickard/dw-cmpxchg-clang/OTP-13336' into maintRickard Green
* rickard/dw-cmpxchg-clang/OTP-13336: Improve cmpxchg8b/cmpxchg16b inline asm
2016-02-22Merge branch 'rickard/gcc5-pic-cmpxchg8b/OTP-13326' into maintRickard Green
* rickard/gcc5-pic-cmpxchg8b/OTP-13326: Improve cmpxchg8b inline asm configure test
2016-02-22eldap: referral resultCodeHans Nilsson
2016-02-22Merge branch 'maint'Sverker Eriksson
2016-02-22Merge branch 'sverk/proc-lock-check-fix' into maintSverker Eriksson
* sverk/proc-lock-check-fix: erts: Fix lock checker for process locks
2016-02-22Merge branch 'maint'Hans Bolinder
* maint: Fix a few dialyzer warnings
2016-02-22Merge branch 'hb/add_dialyzer_suppressions/OTP-12862' into maintHans Bolinder
* hb/add_dialyzer_suppressions/OTP-12862: Fix a few dialyzer warnings
2016-02-22Fix ssl exampleMagnus Henoch
As recently discussed on the erlang-questions mailing list, this example fails to start the ssl application because ssl depends on asn1 nowadays. Let's future-proof this by using application:ensure_all_started/1.
2016-02-22Fix a few dialyzer warningsHans Bolinder
2016-02-22ssh: catch port_close in testHans Nilsson
2016-02-22ssh: remove calls to crypto:start|stopHans Nilsson
Conflicts: lib/ssh/test/ssh_upgrade_SUITE.erl
2016-02-22ssh: add timetrap to all test suitesHans Nilsson
2016-02-22ssh: remove some spurions test printoutsHans Nilsson
2016-02-22Merge branch 'maint'Ingela Anderton Andin
2016-02-22Merge branch 'ia/ssl/connection_information/OTP-13232/OTP-13343' into maintIngela Anderton Andin
* ia/ssl/connection_information/OTP-13232/OTP-13343: ssl: Newer cipher suites now presented correctly ssl: Include options form connect/listen/accept in connection_information/[1,2]
2016-02-22ssl: Newer cipher suites now presented correctlyIngela Anderton Andin
Older SSL/TLS versions have cipher suites that look like {key_exchange(), cipher(), MAC::hash()} and the hash function used by the PRF (Pseudo Random function) is implicit and always the same for that protocol version. In TLS 1.2 a cipher suite is {key_exchange(), cipher(), MAC::hash(), PRF::hash()}. Internally a cipher suite is always a four tuple but for backwards compatibility older cipher suites will be presented as a three tuples, however new cipher suites should be presented as four tuples.
2016-02-22observer: Optimize drawing of graphsDan Gudmundsson
By allowing changes to the number of minutes displayed and update frequency, we need to optimize the drawing of the graphs as it can no longer recalculate everything in each frame drawn. Only recalculate the changed entries, takes more memory but far less cpu usage. While updating the gui, increase the frame-rate a bit so it updates smoother and decrease pen size for graphs to 1 pixel as it looks better according to an office voting.
2016-02-22observer: Make it possible to change the graphs Xaxis and update freqDan Gudmundsson
2016-02-22Merge remote-tracking branch 'upstream/maint'Dan Gudmundsson
* upstream/maint: debugger: Editorial changes in documentation Observer: Editorial changes in documentation