summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'erl_1219' into maintOTP_R15B03-1Björn-Egil Dahlberg2012-12-067-24/+83
|\
| * Prepare releaseErlang/OTP2012-12-062-1/+23
| * Merge branch 'egil/fix-crashdump-default/OTP-10602' into maint-r15Erlang/OTP2012-12-065-23/+60
| |\
| | * erts: Change default of erl_crash.dumpBjörn-Egil Dahlberg2012-11-305-23/+60
* | | Merge tag 'erl_1218' into maintBjörn-Egil Dahlberg2012-12-067-32/+167
|\ \ \ | |/ /
| * | Update release notesErlang/OTP2012-12-061-1/+16
| * | Merge branch 'egil/ia/ssl/accept-timeout/OTP-10600' into maint-r15Erlang/OTP2012-12-066-31/+151
| |\ \ | | |/ | |/|
| | * ssl: Prepare for releaseIngela Anderton Andin2012-12-062-1/+5
| | * ssl: Export sslsocket() dialyzer typeIngela Anderton Andin2012-12-061-1/+3
| | * ssl: Cancel non expired timersIngela Anderton Andin2012-12-061-19/+36
| | * ssl: Fix recv after timeout expiredIngela Anderton Andin2012-12-062-4/+15
| | * ssl: Timeout handling changed so that the fsm-process will terminate if the s...Ingela Anderton Andin2012-12-063-10/+96
| |/
* | Merge branch 'pan/win2012_installer' into maintPatrik Nyblom2012-11-283-5/+34
|\ \ | |/ |/|
| * Teach Win installer to handle redist on w2012/w8Patrik Nyblom2012-11-273-5/+34
|/
* Prepare releaseOTP_R15B03Erlang/OTP2012-11-2621-9/+719
* Merge branch 'egil/fix-heart-unregister' into maintBjörn-Egil Dahlberg2012-11-261-1/+3
|\
| * kernel: Heart port needs to be unregisteredBjörn-Egil Dahlberg2012-11-231-1/+3
* | Merge branch 'raimo/daily-build-fixes' into maintRaimo Niskanen2012-11-263-19/+46
|\ \
| * | Fix erroneous skipping for jinterface, erl_interface and icRaimo Niskanen2012-11-263-19/+46
* | | Update preloaded modulesBjörn-Egil Dahlberg2012-11-238-0/+0
* | | Update primary bootstrapBjörn-Egil Dahlberg2012-11-236-0/+0
| |/ |/|
* | Merge branch 'pan/process_info_spec_doc/r15/OTP-10584' into maintPatrik Nyblom2012-11-231-3/+3
|\ \
| * | Correct doc of process_info(Pid,links)Patrik Nyblom2012-11-221-3/+3
* | | Merge branch 'pan/bs_append_crash' into maintPatrik Nyblom2012-11-231-1/+14
|\ \ \
| * | | Teach erts_bs_append not to dump corePatrik Nyblom2012-11-221-1/+14
* | | | Merge branch 'anders/diameter/doc/OTP-10568' into maintAnders Svensson2012-11-2310-3654/+3424
|\ \ \ \
| * | | | Update doc for RFC 6733Anders Svensson2012-11-227-47/+36
| * | | | Add copies of RFC's 6733 and 6737Anders Svensson2012-11-223-3607/+3388
* | | | | Merge branch 'anders/diameter/doc/OTP-10471' into maintAnders Svensson2012-11-2313-147/+749
|\ \ \ \ \
| * | | | | Add missing diameter_codec(3) contentAnders Svensson2012-11-231-5/+49
| |/ / / /
| * | | | Add content to diameter_codec(3) and diameter_make(3)Anders Svensson2012-11-2211-169/+541
| * | | | Add reference pages diameter_codec(3) and diameter_make(3)Anders Svensson2012-11-224-0/+186
| | |_|/ | |/| |
* | | | Update copyright yearsBjörn-Egil Dahlberg2012-11-2332-32/+32
* | | | Merge branch 'peppe/common_test/group_search_r15b03.fix' into maintPeter Andersson2012-11-231-1/+1
|\ \ \ \
| * | | | Fix silly bugPeter Andersson2012-11-231-1/+1
|/ / / /
* | | | Merge branch 'egil/fix-crash_dump-lc-assert' into maintBjörn-Egil Dahlberg2012-11-231-1/+1
|\ \ \ \
| * | | | erts: Suppress lock assertion when dumping a crashBjörn-Egil Dahlberg2012-11-161-1/+1
* | | | | Merge remote branch 'origin/peppe/common_test/group_search_docs' into maintPeter Andersson2012-11-223-18/+183
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Document the new group search featurePeter Andersson2012-11-213-18/+183
| | |_|/ | |/| |
* | | | Merge branch 'fredrik/ssh/fix-dialyzer-warn-r15b03' into maintFredrik Gustafsson2012-11-221-3/+2
|\ \ \ \
| * | | | is_boolean/1 is called instead of checkingFredrik Gustafsson2012-11-211-2/+1
| * | | | Removed ip options to gen_tcp from ssh.erlFredrik Gustafsson2012-11-201-1/+1
* | | | | Merge branch 'ia/pan/fix-public-key-doc' into maintIngela Anderton Andin2012-11-212-3/+4
|\ \ \ \ \
| * | | | | Make public_key doc compile againPatrik Nyblom2012-11-212-3/+4
* | | | | | Merge branch 'ph/erl_interface/check-thread-support/OTP-10581' into maintBjörn-Egil Dahlberg2012-11-216-7/+51
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Teach erl_interface configure more pthread supportPer Hedeland2012-11-146-7/+51
* | | | | | Merge remote branch 'origin/peppe/common_test/group_search_r15b03' into maintPeter Andersson2012-11-209-413/+2160
|\ \ \ \ \ \
| * | | | | | Fix problem with test case order in group specificationsPeter Andersson2012-11-192-46/+86
| * | | | | | Finish the test suite and correct remaining bugsPeter Andersson2012-11-194-535/+618
| * | | | | | Implement new group search functionalityPeter Andersson2012-11-199-398/+2022
| | |_|/ / / | |/| | | |