summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sverk/master/halt-INT_MINSverker Eriksson2016-02-241624-56819/+40364
|\
| * Merge branch 'maint'Rickard Green2016-02-241-31/+71
| |\
| | * Merge branch 'rickard/proc-not-running/OTP-13365' into maintRickard Green2016-02-241-31/+71
| | |\
| | | * Do not wait for main lock when looking up process not runningRickard Green2016-02-231-31/+71
| * | | Merge branch 'maint'Hans Bolinder2016-02-243-6/+10
| |\ \ \ | | |/ /
| | * | [erl_interface] Correct documentationHans Bolinder2016-02-243-6/+10
| * | | Merge branch 'maint'Hans Bolinder2016-02-244-3/+3
| |\ \ \ | | |/ /
| | * | Update preloaded moduleHans Bolinder2016-02-241-0/+0
| | * | typosSverker Eriksson2016-02-233-3/+3
| | |/
| * | Merge branch 'maint'Hans Nilsson2016-02-2313-155/+109
| |\ \ | | |/
| | * Merge branch 'hans/ssh/maint_cuddle_tests' into maintHans Nilsson2016-02-2313-158/+109
| | |\
| | | * ssh: catch port_close in testHans Nilsson2016-02-221-1/+1
| | | * ssh: remove calls to crypto:start|stopHans Nilsson2016-02-2212-142/+60
| | | * ssh: add timetrap to all test suitesHans Nilsson2016-02-2211-7/+29
| | | * ssh: remove some spurions test printoutsHans Nilsson2016-02-223-9/+20
| * | | Merge branch 'dgud/observer/perf-freq'Dan Gudmundsson2016-02-234-366/+562
| |\ \ \
| | * | | observer: Optimize drawing of graphsDan Gudmundsson2016-02-224-366/+481
| | * | | observer: Make it possible to change the graphs Xaxis and update freqDan Gudmundsson2016-02-221-49/+130
| * | | | Merge branch 'maint'Henrik Nord2016-02-237-29/+256
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'maint-18' into maintHenrik Nord2016-02-237-30/+256
| | |\ \ \
| | | * | | Updated OTP versionOTP-18.2.4Erlang/OTP2016-02-182-1/+2
| | | * | | Prepare releaseErlang/OTP2016-02-182-1/+21
| | | * | | Merge branch 'siri/ct_netconfc/multpile-end-tags/OTP-13323' into maint-18Erlang/OTP2016-02-183-28/+233
| | | |\ \ \
| | | | * | | [ct_netconfc] Fix XML parsing when multiple messages in packageSiri Hansen2016-02-183-28/+233
| | | |/ / /
| * | | | | Merge branch 'maint'Rickard Green2016-02-223-58/+181
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'rickard/dw-cmpxchg-clang/OTP-13336' into maintRickard Green2016-02-222-32/+49
| | |\ \ \ \
| | | * | | | Improve cmpxchg8b/cmpxchg16b inline asmRickard Green2016-02-182-32/+49
| | * | | | | Merge branch 'rickard/gcc5-pic-cmpxchg8b/OTP-13326' into maintRickard Green2016-02-223-29/+135
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Improve cmpxchg8b inline asm configure testRickard Green2016-02-173-29/+135
| | | |/ / /
| * | | | | Merge branch 'maint'Sverker Eriksson2016-02-221-3/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'sverk/proc-lock-check-fix' into maintSverker Eriksson2016-02-221-3/+4
| | |\ \ \ \
| | | * | | | erts: Fix lock checker for process locksSverker Eriksson2016-02-181-3/+4
| | | |/ / /
| * | | | | Merge branch 'maint'Hans Bolinder2016-02-2222-49/+105
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'hb/add_dialyzer_suppressions/OTP-12862' into maintHans Bolinder2016-02-2222-49/+106
| | |\ \ \ \
| | | * | | | Fix a few dialyzer warningsHans Bolinder2016-02-2222-49/+106
| | |/ / / /
| * | | | | Merge branch 'maint'Ingela Anderton Andin2016-02-228-103/+213
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Merge branch 'ia/ssl/connection_information/OTP-13232/OTP-13343' into maintIngela Anderton Andin2016-02-228-103/+213
| | |\ \ \
| | | * | | ssl: Newer cipher suites now presented correctlyIngela Anderton Andin2016-02-222-14/+23
| | | * | | ssl: Include options form connect/listen/accept in connection_information/[1,2]Ingela Anderton Andin2016-02-228-92/+193
| * | | | | Merge remote-tracking branch 'upstream/maint'Dan Gudmundsson2016-02-2221-1921/+2198
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'dgud/debugger/doc' into maintDan Gudmundsson2016-02-228-696/+743
| | |\ \ \ \
| | | * | | | debugger: Editorial changes in documentationxsipewe2016-02-228-696/+743
| | |/ / / /
| | * | | | Merge branch 'dgud/observer/doc' into maintDan Gudmundsson2016-02-2213-1225/+1455
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Observer: Editorial changes in documentationtmanevik2016-02-2213-1225/+1455
| * | | | | Merge branch 'maint'Rickard Green2016-02-190-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'rickard/rq-state-bug/OTP-13298' into maintRickard Green2016-02-191-1/+1
| | |\ \ \ \
| | | * | | | Fix bug causing run-queue mask to become inconsistentRickard Green2016-02-041-1/+1
| * | | | | | Merge branch 'maint'Ingela Anderton Andin2016-02-190-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'ia/pr/public_key-typos' into maintIngela Anderton Andin2016-02-192-8/+8
| | |\ \ \ \ \
| | | * | | | | Fix public_key documentation typosMagnus Henoch2016-02-192-8/+8
| | |/ / / / /