summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into majorBjörn-Egil Dahlberg2011-09-2982-82/+82
|\
| * Update copyright yearsBjörn-Egil Dahlberg2011-09-2988-88/+88
* | Merge branch 'dev' into majorLukas Larsson2011-09-293-34/+44
|\ \ | |/
| * Merge branch 'sverker/stub-module-code-leakage' into devLukas Larsson2011-09-293-34/+44
| |\
| | * Prevent valgrind warning for erts_alloc_permanent_cache_alignedSverker Eriksson2011-09-282-16/+25
| | * [erts] Fix memory leak in erts_make_stub_module (hipe loading)Sverker Eriksson2011-09-281-18/+19
* | | Merge branch 'dev' into majorLukas Larsson2011-09-299-20/+48
|\ \ \ | |/ /
| * | Merge branch 'lukas/fix_erts_testcases/OTP-9596' into devLukas Larsson2011-09-299-20/+48
| |\ \
| | * | Skip create_big_boot on platforms without cryptoLukas Larsson2011-09-291-0/+7
| | * | Remove test_server path instead of cwd for clash testLukas Larsson2011-09-291-6/+8
| | * | Skip getaddr_v6 test if on the ipv4_only hostLukas Larsson2011-09-291-1/+1
| | * | Use static port for old solaris versionsLukas Larsson2011-09-291-3/+9
| | * | Extend time to wait for zone files to be loadedLukas Larsson2011-09-291-2/+2
| | * | Allow out of memory exception for max_port checksLukas Larsson2011-09-291-0/+2
| | * | Extend slave start timeout for windows testsLukas Larsson2011-09-291-2/+4
| | * | Double timeout to make sure debug builds passLukas Larsson2011-09-291-2/+2
| | * | Use now instead of os:timestampLukas Larsson2011-09-291-2/+2
| | * | Increase timeout in scheduler_suspend for slow platformsLukas Larsson2011-09-211-1/+1
| | * | Skip update_cpu_info if 'taskset' cannot be foundLukas Larsson2011-09-211-1/+10
* | | | Merge branch 'dev' into majorHenrik Nord2011-09-293-14/+23
|\ \ \ \ | |/ / /
| * | | Merge branch 'sa/dialyzer-bug-fixes' into devHenrik Nord2011-09-293-14/+23
| |\ \ \
| | * | | Fix typer's crash for nonexisting filesStavros Aronis2011-09-281-3/+9
| | * | | Remove unused macroStavros Aronis2011-09-271-1/+0
| | * | | Decrease tuple arity limitStavros Aronis2011-09-271-1/+1
| | * | | Fix bug in dataflowStavros Aronis2011-09-271-9/+13
| | |/ /
* | | | Merge branch 'dev' into majorAnders Svensson2011-09-291-7/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'anders/diameter/testsuites/OTP-9553' into devAnders Svensson2011-09-291-7/+0
| |\ \ \
| | * | | Remove forgotten dbgAnders Svensson2011-09-291-7/+0
* | | | | Merge branch 'dev' into majorAnders Svensson2011-09-281-56/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'anders/diameter/testsuites/OTP-9553' into devAnders Svensson2011-09-281-56/+11
| |\ \ \ \ | | |/ / /
| | * | | Don't install Emakefile at release_testsAnders Svensson2011-09-281-56/+11
* | | | | Merge branch 'dev' into majorHenrik Nord2011-09-2850-1390/+73
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'rc/eunit-2.2.1' into devHenrik Nord2011-09-2829-1344/+21
| |\ \ \ \
| | * | | | removed some never-matching clauses reported by dialyzerRichard Carlsson2011-09-251-7/+1
| | * | | | updated author e-mails and homepagesRichard Carlsson2011-09-2515-21/+16
| | * | | | removed cvs keywords from filesRichard Carlsson2011-09-2517-34/+0
| | * | | | removed files that should not be checked inRichard Carlsson2011-09-2511-1282/+4
| | | |/ / | | |/| |
| * | | | Merge branch 'rc/edoc-0.7.9' into devHenrik Nord2011-09-2821-46/+52
| |\ \ \ \
| | * | | | bumped revisionRichard Carlsson2011-09-251-1/+1
| | * | | | removed some never-matching clauses reported by dialyzerRichard Carlsson2011-09-251-6/+1
| | * | | | Fix macro expansion in comments following Erlang typesHans Bolinder2011-09-251-6/+9
| | * | | | URI-escape bytes as two hex digits always (reported by Alfonso De Gregorio)Richard Carlsson2011-09-251-9/+7
| | * | | | updated author e-mailRichard Carlsson2011-09-2520-24/+24
| | * | | | recognize some more URI schemas in wiki text, in particular httpsRichard Carlsson2011-09-251-0/+10
| | |/ / /
* | | | | Merge branch 'dev' into majorRaimo Niskanen2011-09-282-12/+54
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'raimo/sctp-getsetopts-dev/OTP-9544' into devRaimo Niskanen2011-09-282-12/+54
| |\ \ \ \
| | * \ \ \ Merge branch 'raimo/sctp-getsetopts/OTP-9544' into raimo/sctp-getsetopts-dev/...Raimo Niskanen2011-09-192-12/+54
| | |\ \ \ \
| | | * | | | erts,kernel: Bugfix - read SCTP socket options from right protocol layerRaimo Niskanen2011-09-192-5/+22
| | | * | | | erts: Fix bug SCTP send can only be called from controlling processRaimo Niskanen2011-09-192-5/+34
* | | | | | | Merge remote-tracking branch 'upstream/dev' into majorDan Gudmundsson2011-09-282-1/+3
|\ \ \ \ \ \ \ | |/ / / / / /