Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'henrik/epmd-ctime' into maint | Henrik Nord | 2015-11-11 | 1 | -1/+1 |
|\ | |||||
| * | add missing time.h | Henrik Nord | 2015-11-04 | 1 | -1/+1 |
* | | Merge branch 'gomoripeti/tracedoc_fix' into maint | Henrik Nord | 2015-11-11 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix typo in trace gc_start doc | Péter Gömöri | 2015-11-03 | 1 | -1/+1 |
* | | | Fix typos and grammar | Derek Brown | 2015-11-04 | 2 | -17/+17 |
| |/ |/| | |||||
* | | [erts] Correct documentation | Hans Bolinder | 2015-11-04 | 11 | -141/+148 |
|/ | |||||
* | Merge branch 'lukas/erts/win32_bool_fix/OTP-13079' into maint | Lukas Larsson | 2015-11-02 | 2 | -6/+6 |
|\ | |||||
| * | erts: bool is a reserved word, use boolean instead | Lukas Larsson | 2015-08-25 | 2 | -6/+6 |
* | | Merge branch 'lukas/erts/process_mem_test_fix/OTP-13077' into maint | Lukas Larsson | 2015-11-02 | 1 | -1/+9 |
|\ \ | |||||
| * | | erts: Don't run processes tests on lcnt with little memory | Lukas Larsson | 2015-10-12 | 1 | -1/+9 |
* | | | Merge branch 'henrik/find-redist' into maint | Henrik Nord | 2015-11-02 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | add path to vcredist.exe for VS-2013 | Henrik Nord | 2015-10-16 | 1 | -1/+1 |
* | | | | Merge branch 'lrascao/fix/build_fail_on_enabled_dist_debug' into maint | Henrik Nord | 2015-10-27 | 1 | -7/+11 |
|\ \ \ \ | |||||
| * | | | | Fix build fail when enabling distribution debug messages | Luis Rascao | 2015-10-05 | 1 | -7/+11 |
| |/ / / | |||||
* | | | | Merge branch 'lucafavatella/dialyzer-fun-literal-arity' into maint | Henrik Nord | 2015-10-27 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Teach Dialyzer arity of funs with literal arity | Luca Favatella | 2015-07-11 | 1 | -0/+1 |
* | | | | | Merge branch 'dgud/msys2-fixes' into maint | Dan Gudmundsson | 2015-10-27 | 5 | -6/+29 |
|\ \ \ \ \ | |||||
| * | | | | | erts: Detect and build on MSYS2 for windows | Dan Gudmundsson | 2015-10-22 | 5 | -6/+29 |
| | |/ / / | |/| | | | |||||
* | | | | | erts: Clarify documentation | Ingela Anderton Andin | 2015-10-26 | 1 | -7/+7 |
* | | | | | erts: Add {line_delimiter, byte()} option to inet:setopts/2 | Serge Aleynikov | 2015-10-26 | 8 | -6/+31 |
* | | | | | Merge branch 'kostis/hipe-native-bif-warning' into maint | Henrik Nord | 2015-10-13 | 1 | -3/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Take out unused code that results in a gcc warning | Kostis Sagonas | 2015-08-20 | 1 | -3/+0 |
* | | | | | Merge branch 'sverk/erts/doc-review' into maint | Sverker Eriksson | 2015-10-06 | 3 | -3773/+4289 |
|\ \ \ \ \ | |||||
| * | | | | | erts: Spell-check erlang.xml | Sverker Eriksson | 2015-10-05 | 1 | -32/+31 |
| * | | | | | erts: Review newer additions to erlang.xml | Sverker Eriksson | 2015-10-01 | 1 | -138/+136 |
| * | | | | | erts: Review module erlang docs | Sverker Eriksson | 2015-10-01 | 2 | -234/+223 |
| * | | | | | erts: Update module erlang docs | xsipewe | 2015-10-01 | 1 | -3194/+3702 |
| * | | | | | erts: Review time correction docs | Sverker Eriksson | 2015-10-01 | 1 | -9/+9 |
| * | | | | | erts: Update erts time correction docs | xsipewe | 2015-10-01 | 1 | -371/+393 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'lukas/erts/fix_ptab_assert/OTP-13028' into maint | Lukas Larsson | 2015-10-05 | 1 | -6/+0 |
|\ \ \ \ \ | |||||
| * | | | | | erts: Remove assertion that ptab is empty | Lukas Larsson | 2015-09-28 | 1 | -6/+0 |
| |/ / / / | |||||
* | | | | | Merge branch 'essen/missing-behavior-absform' into maint | Zandra | 2015-10-02 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Add missing behavior/behaviours to absform docs | Loïc Hoguin | 2015-08-28 | 1 | -0/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'maint-17' into maint | Henrik Nord | 2015-10-01 | 1 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Prepare release | Erlang/OTP | 2015-09-07 | 2 | -1/+18 |
| * | | | | | Merge branch 'sverk/trace-process_dump-matchstate-17/OTP-12968' into maint-17 | Erlang/OTP | 2015-09-07 | 6 | -31/+54 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'c-rack/fix-list_to_bitstring-example' into maint | Henrik Nord | 2015-09-30 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Typos in documentation example of list_to_bitstring/1 | Constantin Rack | 2015-09-15 | 1 | -3/+3 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Prepare release | Erlang/OTP | 2015-09-21 | 2 | -1/+124 |
* | | | | | | Merge branch 'lukas/erts/ttsl_eintr/OTP-12987' into maint | Rickard Green | 2015-09-17 | 1 | -7/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | erts: Make sure to deal with EINTR write failures | Lukas Larsson | 2015-09-16 | 1 | -7/+8 |
* | | | | | | | Exclude ose application from upgrade test | Siri Hansen | 2015-09-17 | 1 | -1/+1 |
* | | | | | | | Merge branch 'goertzenator/enif_make_pid-unused_param' into maint | Henrik Nord | 2015-09-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix unused parameter warning in enif_make_pid | Daniel Goertzen | 2015-08-11 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mikpe/erts-binary_to_integer-fix' into maint | Henrik Nord | 2015-09-17 | 2 | -1/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | erts: fix binary_to_integer boundary case | Mikael Pettersson | 2015-07-31 | 2 | -1/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'sverk/inet-packet-ssl_tls-passive' into maint | Sverker Eriksson | 2015-09-10 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | erts: Fix inet packet mode ssl_tls for passive mode | Sverker Eriksson | 2015-09-07 | 1 | -3/+3 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rickard/disable-saved-compile-time/OTP-12971' into maint | Rickard Green | 2015-09-09 | 5 | -3/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add configure switch --disable-saved-compile-time | Rickard Green | 2015-09-09 | 5 | -3/+24 |
| |/ / / / / / |