Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'erl_1219' into maintOTP_R15B03-1 | Björn-Egil Dahlberg | 2012-12-06 | 7 | -24/+83 |
|\ | |||||
| * | Prepare release | Erlang/OTP | 2012-12-06 | 2 | -1/+23 |
| * | Merge branch 'egil/fix-crashdump-default/OTP-10602' into maint-r15 | Erlang/OTP | 2012-12-06 | 5 | -23/+60 |
| |\ | |||||
| | * | erts: Change default of erl_crash.dump | Björn-Egil Dahlberg | 2012-11-30 | 5 | -23/+60 |
* | | | Merge tag 'erl_1218' into maint | Björn-Egil Dahlberg | 2012-12-06 | 7 | -32/+167 |
|\ \ \ | |/ / | |||||
| * | | Update release notes | Erlang/OTP | 2012-12-06 | 1 | -1/+16 |
| * | | Merge branch 'egil/ia/ssl/accept-timeout/OTP-10600' into maint-r15 | Erlang/OTP | 2012-12-06 | 6 | -31/+151 |
| |\ \ | | |/ | |/| | |||||
| | * | ssl: Prepare for release | Ingela Anderton Andin | 2012-12-06 | 2 | -1/+5 |
| | * | ssl: Export sslsocket() dialyzer type | Ingela Anderton Andin | 2012-12-06 | 1 | -1/+3 |
| | * | ssl: Cancel non expired timers | Ingela Anderton Andin | 2012-12-06 | 1 | -19/+36 |
| | * | ssl: Fix recv after timeout expired | Ingela Anderton Andin | 2012-12-06 | 2 | -4/+15 |
| | * | ssl: Timeout handling changed so that the fsm-process will terminate if the s... | Ingela Anderton Andin | 2012-12-06 | 3 | -10/+96 |
| |/ | |||||
* | | Merge branch 'pan/win2012_installer' into maint | Patrik Nyblom | 2012-11-28 | 3 | -5/+34 |
|\ \ | |/ |/| | |||||
| * | Teach Win installer to handle redist on w2012/w8 | Patrik Nyblom | 2012-11-27 | 3 | -5/+34 |
|/ | |||||
* | Prepare releaseOTP_R15B03 | Erlang/OTP | 2012-11-26 | 21 | -9/+719 |
* | Merge branch 'egil/fix-heart-unregister' into maint | Björn-Egil Dahlberg | 2012-11-26 | 1 | -1/+3 |
|\ | |||||
| * | kernel: Heart port needs to be unregistered | Björn-Egil Dahlberg | 2012-11-23 | 1 | -1/+3 |
* | | Merge branch 'raimo/daily-build-fixes' into maint | Raimo Niskanen | 2012-11-26 | 3 | -19/+46 |
|\ \ | |||||
| * | | Fix erroneous skipping for jinterface, erl_interface and ic | Raimo Niskanen | 2012-11-26 | 3 | -19/+46 |
* | | | Update preloaded modules | Björn-Egil Dahlberg | 2012-11-23 | 8 | -0/+0 |
* | | | Update primary bootstrap | Björn-Egil Dahlberg | 2012-11-23 | 6 | -0/+0 |
| |/ |/| | |||||
* | | Merge branch 'pan/process_info_spec_doc/r15/OTP-10584' into maint | Patrik Nyblom | 2012-11-23 | 1 | -3/+3 |
|\ \ | |||||
| * | | Correct doc of process_info(Pid,links) | Patrik Nyblom | 2012-11-22 | 1 | -3/+3 |
* | | | Merge branch 'pan/bs_append_crash' into maint | Patrik Nyblom | 2012-11-23 | 1 | -1/+14 |
|\ \ \ | |||||
| * | | | Teach erts_bs_append not to dump core | Patrik Nyblom | 2012-11-22 | 1 | -1/+14 |
* | | | | Merge branch 'anders/diameter/doc/OTP-10568' into maint | Anders Svensson | 2012-11-23 | 10 | -3654/+3424 |
|\ \ \ \ | |||||
| * | | | | Update doc for RFC 6733 | Anders Svensson | 2012-11-22 | 7 | -47/+36 |
| * | | | | Add copies of RFC's 6733 and 6737 | Anders Svensson | 2012-11-22 | 3 | -3607/+3388 |
* | | | | | Merge branch 'anders/diameter/doc/OTP-10471' into maint | Anders Svensson | 2012-11-23 | 13 | -147/+749 |
|\ \ \ \ \ | |||||
| * | | | | | Add missing diameter_codec(3) content | Anders Svensson | 2012-11-23 | 1 | -5/+49 |
| |/ / / / | |||||
| * | | | | Add content to diameter_codec(3) and diameter_make(3) | Anders Svensson | 2012-11-22 | 11 | -169/+541 |
| * | | | | Add reference pages diameter_codec(3) and diameter_make(3) | Anders Svensson | 2012-11-22 | 4 | -0/+186 |
| | |_|/ | |/| | | |||||
* | | | | Update copyright years | Björn-Egil Dahlberg | 2012-11-23 | 32 | -32/+32 |
* | | | | Merge branch 'peppe/common_test/group_search_r15b03.fix' into maint | Peter Andersson | 2012-11-23 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix silly bug | Peter Andersson | 2012-11-23 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch 'egil/fix-crash_dump-lc-assert' into maint | Björn-Egil Dahlberg | 2012-11-23 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | erts: Suppress lock assertion when dumping a crash | Björn-Egil Dahlberg | 2012-11-16 | 1 | -1/+1 |
* | | | | | Merge remote branch 'origin/peppe/common_test/group_search_docs' into maint | Peter Andersson | 2012-11-22 | 3 | -18/+183 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Document the new group search feature | Peter Andersson | 2012-11-21 | 3 | -18/+183 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'fredrik/ssh/fix-dialyzer-warn-r15b03' into maint | Fredrik Gustafsson | 2012-11-22 | 1 | -3/+2 |
|\ \ \ \ | |||||
| * | | | | is_boolean/1 is called instead of checking | Fredrik Gustafsson | 2012-11-21 | 1 | -2/+1 |
| * | | | | Removed ip options to gen_tcp from ssh.erl | Fredrik Gustafsson | 2012-11-20 | 1 | -1/+1 |
* | | | | | Merge branch 'ia/pan/fix-public-key-doc' into maint | Ingela Anderton Andin | 2012-11-21 | 2 | -3/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Make public_key doc compile again | Patrik Nyblom | 2012-11-21 | 2 | -3/+4 |
* | | | | | | Merge branch 'ph/erl_interface/check-thread-support/OTP-10581' into maint | Björn-Egil Dahlberg | 2012-11-21 | 6 | -7/+51 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Teach erl_interface configure more pthread support | Per Hedeland | 2012-11-14 | 6 | -7/+51 |
* | | | | | | Merge remote branch 'origin/peppe/common_test/group_search_r15b03' into maint | Peter Andersson | 2012-11-20 | 9 | -413/+2160 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix problem with test case order in group specifications | Peter Andersson | 2012-11-19 | 2 | -46/+86 |
| * | | | | | | Finish the test suite and correct remaining bugs | Peter Andersson | 2012-11-19 | 4 | -535/+618 |
| * | | | | | | Implement new group search functionality | Peter Andersson | 2012-11-19 | 9 | -398/+2022 |
| | |_|/ / / | |/| | | | |