summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'OTP_R16B01'Björn-Egil Dahlberg2013-06-1855-33/+2059
|\
| * Prepare releaseOTP_R16B01Erlang/OTP2013-06-1756-34/+2060
* | Merge branch 'maint'Sverker Eriksson2013-06-171-0/+9
|\ \ | |/
| * Merge branch 'sverk/term_to_binary-memleak' into maintSverker Eriksson2013-06-171-0/+9
| |\
| | * erts: Fix memory leak in term_to_binary/2 with compressed optionSverker Eriksson2013-06-141-0/+9
* | | Merge branch 'maint'Raimo Niskanen2013-06-152-2/+26
|\ \ \ | |/ /
| * | Merge branch 'raimo/race-in-prim_inet-close/OTP-10497' into maintRaimo Niskanen2013-06-152-2/+26
| |\ \
| | * | Improve solutionRaimo Niskanen2013-06-152-2/+26
| |/ /
* | | Merge branch 'maint'Anders Svensson2013-06-142-14/+77
|\ \ \ | |/ /
| * | Merge branch 'anders/diameter/vendor_specific_function_clause/OTP-11165' into...Anders Svensson2013-06-142-14/+77
| |\ \ | | |/ | |/|
| | * Fix list-valued Vendor-Specific-Application-Id configAnders Svensson2013-06-132-14/+77
* | | Merge branch 'maint'Björn-Egil Dahlberg2013-06-12129-129/+129
|\ \ \ | |/ /
| * | Update copyright yearsBjörn-Egil Dahlberg2013-06-12158-158/+158
* | | Merge branch 'maint'Björn-Egil Dahlberg2013-06-120-0/+0
|\ \ \ | |/ /
| * | Update preloaded modulesBjörn-Egil Dahlberg2013-06-1210-0/+0
* | | Merge branch 'maint'Björn-Egil Dahlberg2013-06-120-0/+0
|\ \ \ | |/ /
| * | Update primary bootstrap appup filesBjörn-Egil Dahlberg2013-06-123-3/+3
| * | Update primary bootstrapBjörn-Egil Dahlberg2013-06-127-0/+0
* | | Merge branch 'maint'Rickard Green2013-06-125-3/+117
|\ \ \ | |/ /
| * | Merge branch 'rickard/+sfwi/OTP-11164' into maintRickard Green2013-06-125-3/+117
| |\ \
| | * | erts: Add the +sfwi system flagRickard Green2013-06-115-3/+117
* | | | Merge branch 'maint'Sverker Eriksson2013-06-1213-121/+808
|\ \ \ \ | |/ / /
| * | | Merge branch 'sverk/crypto-upgrade-resource-bug' into maintSverker Eriksson2013-06-121-5/+8
| |\ \ \
| | * | | crypto: Fix bug with takover of EC resource typeSverker Eriksson2013-06-111-5/+8
| | |/ /
| * | | Merge branch 'pan/happi/yield_in_term_to_binary' into maintOTP_R16B01_RC1Patrik Nyblom2013-06-1112-116/+800
| |\ \ \ | | |_|/ | |/| |
| | * | Add testcase to stress extra_rootPatrik Nyblom2013-06-111-3/+35
| | * | term_to_binary: Remove debug code and set production trap levelsPatrik Nyblom2013-06-102-8/+6
| | * | Teach erl_gc:offset_rootset about extra_rootPatrik Nyblom2013-06-062-1/+7
| | * | Teach external.c to handle reallocs before compressionPatrik Nyblom2013-06-051-0/+1
| | * | Make all steps ofterm_to_binary work in chunks and yieldPatrik Nyblom2013-06-0512-458/+824
| | * | Make term_to_binary yield (trap).happi2013-06-049-133/+414
* | | | Merge branch 'maint'Anders Svensson2013-06-111-2/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'anders/diameter/request_spawn/OTP-11060' into maintAnders Svensson2013-06-111-2/+4
| |\ \ \
| | * | | Minor doc fixAnders Svensson2013-06-111-2/+4
* | | | | Merge branch 'maint'Anders Svensson2013-06-1128-111/+351
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'anders/diameter/release/R16B01/OTP-11120' into maintAnders Svensson2013-06-1118-39/+66
| |\ \ \ \
| | * | | | vsn -> 1.4.2Anders Svensson2013-06-101-1/+1
| | * | | | Update appup for R16B01Anders Svensson2013-06-101-2/+29
| | * | | | Trailing whitespace and copyright fixesAnders Svensson2013-06-1014-35/+35
| | * | | | Minor macro simplificationAnders Svensson2013-06-101-1/+1
| | * | | | Move app/appsrc from src/base into srcAnders Svensson2013-06-102-0/+0
| * | | | | Merge branch 'anders/diameter/request_spawn/OTP-11060' into maintAnders Svensson2013-06-116-14/+76
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Make spawn options for request processes configurableAnders Svensson2013-06-106-14/+76
| | |/ / /
| * | | | Merge branch 'anders/diameter/peer_address_config/OTP-10893' into maintAnders Svensson2013-06-116-60/+211
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Let diameter_{tcp,sctp} be configured with permissible remote addressesAnders Svensson2013-06-106-52/+174
| | * | | Fix diameter_{tcp,sctp} specAnders Svensson2013-06-102-8/+37
| | * | | Remove trailing whitespaceAnders Svensson2013-06-101-3/+3
| | |/ /
* | | | Merge branch 'maint'Rickard Green2013-06-102-11/+36
|\ \ \ \ | |/ / /
| * | | Merge branch 'rickard-sverker/carrier-migration/OTP-10279' into maintRickard Green2013-06-102-11/+36
| |\ \ \
| | * | | erts: Fix warningRickard Green2013-06-101-0/+6