summaryrefslogtreecommitdiff
path: root/make
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint-23' into maintRickard Green2020-05-201-0/+6
|\ | | | | | | | | | | | | | | | | * maint-23: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
| * Prepare releaseErlang/OTP2020-05-201-200/+5
| |
* | Prepare for developmentHenrik Nord2020-05-131-201/+1
|/
* Prepare releaseErlang/OTP2020-05-111-1/+201
|
* Revert "Prepare release"Henrik Nord2020-04-221-172/+1
| | | | This reverts commit eee1f3aba92b5a741eabfa1cb6eca0632562777a.
* Prepare releaseErlang/OTP2020-04-221-1/+172
|
* Bump forward merge versionRickard Green2020-04-211-1/+1
|
* Merge branch 'maint'Rickard Green2020-04-061-62/+0
|\ | | | | | | | | | | | | | | | | | | | | * maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # lib/stdlib/src/stdlib.app.src # make/otp_version_tickets_in_merge
| * Merge branch 'maint-22' into maintRickard Green2020-04-061-0/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
| | * Prepare releaseErlang/OTP2020-04-061-62/+8
| | |
* | | make: Fix parallel make of release_docsLukas Larsson2020-03-271-3/+3
| | |
* | | Fix markdown see link generationLukas Larsson2020-03-271-7/+13
| | |
* | | docgen: Make all internal href links in chunks absoluteLukas Larsson2020-03-271-3/+3
| | |
* | | docgen: Generate correct see tags for edoc and specsLukas Larsson2020-03-271-5/+5
| | |
* | | Revert "Prepare release"Henrik Nord2020-03-251-156/+1
| | | | | | | | | | | | This reverts commit 63638d668efbeb4539ba301328cabbc2636fb154.
* | | Prepare releaseErlang/OTP2020-03-241-1/+156
| | |
* | | Merge branch 'maint'Rickard Green2020-03-241-1/+1
|\ \ \ | |/ / | | | | | | | | | * maint: Bump patch merge version
| * | Bump patch merge versionRickard Green2020-03-241-1/+1
| | |
| * | Prepare for developmentRickard Green2020-03-161-62/+1
| |/
* | Merge pull request #2568 from ↵Lukas Larsson2020-03-231-4/+4
|\ \ | | | | | | | | | | | | garazdawi/lukas/kernel/code-chunk-lookup/rc2/OTP-16494/OTP-16222/OTP-16406/OTP-16499/OTP-16500/OTP-16501/OTP-16502/OTP-16503 Updates of EEP-48 support for OTP-23 rc2
| * | otp: Fix chunks makefile dependencyLukas Larsson2020-03-201-4/+4
| | | | | | | | | | | | | | | | | | The core logic has been moved to a .erl file so we put the dependency on the .beam file instead as the escript is only a wrapper.
* | | Skip all results in $ERL_TOP/make in prebuildRickard Green2020-03-201-0/+1
|/ /
* | Merge branch 'maint'Rickard Green2020-03-161-0/+62
|\ \ | |/ | | | | | | | | | | | | | | | | * maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/socket.xml
| * Prepare releaseErlang/OTP2020-03-131-1/+62
| |
| * Merge branch 'maint-21' into maintJohn Högberg2020-03-051-3/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # make/otp_version_tickets # otp_versions.table
| | * Prepare releaseErlang/OTP2020-03-041-3/+3
| | |
| * | Merge branch 'maint-22' into maintAnders Svensson2020-02-281-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
| | * | Prepare releaseErlang/OTP2020-02-271-4/+3
| | | |
| * | | Merge branch 'maint-20' into maintHans Nilsson2020-02-281-4/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-20: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/ssh/doc/src/notes.xml # lib/ssh/vsn.mk # make/otp_version_tickets # otp_versions.table
| | * | | Prepare releaseErlang/OTP2020-02-271-4/+6
| | | | |
| | * | | Prepare releaseErlang/OTP2020-01-161-4/+4
| | | | |
| * | | | Merge branch 'maint-22' into maintJohn Högberg2020-02-181-1/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
| | * | | Prepare releaseErlang/OTP2020-02-171-1/+4
| | | | |
| * | | | Merge branch 'maint-22' into maintRickard Green2020-02-051-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
| | * | | Prepare releaseErlang/OTP2020-02-051-3/+1
| | | | |
| * | | | Merge branch 'maint-21' into maintBjörn Gustavsson2020-02-031-3/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/stdlib/doc/src/notes.xml # lib/stdlib/vsn.mk # make/otp_version_tickets # otp_versions.table
| | * | | Prepare releaseErlang/OTP2020-02-031-5/+3
| | | | |
| * | | | Merge branch 'maint-22' into maintRickard Green2020-02-031-3/+3
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
| | * | | Prepare releaseErlang/OTP2020-02-031-3/+3
| | | | |
| * | | | Merge branch 'maint-22' into maintIngela Anderton Andin2020-01-281-3/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
| | * | | Prepare releaseErlang/OTP2020-01-271-3/+3
| | | | |
| * | | | Merge branch 'maint-22' into maintJohn Högberg2020-01-201-0/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
| | * | | Prepare releaseErlang/OTP2020-01-171-7/+3
| | | | |
| * | | | Merge branch 'maint-21' into maintHans Nilsson2020-01-201-7/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/crypto/doc/src/notes.xml # lib/crypto/vsn.mk # lib/ssh/doc/src/notes.xml # lib/ssh/src/ssh.app.src # lib/ssh/vsn.mk # make/otp_version_tickets # otp_versions.table
| | * | | Prepare releaseErlang/OTP2020-01-161-5/+5
| | | | |
| | * | | Prepare releaseErlang/OTP2019-11-141-2/+5
| | | | |
| * | | | Merge branch 'maint-22' into maintRickard Green2020-01-131-0/+7
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
| | * | | Prepare releaseErlang/OTP2020-01-131-6/+7
| | | | |
| * | | | Merge tag 'OTP-22.1.8.1' into maintMicael Karlberg2020-01-101-6/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | === OTP-22.1.8.1 === Changed Applications: - snmp-5.4.3.1 Unchanged Applications: - asn1-5.0.9 - common_test-1.18 - compiler-7.4.9 - crypto-4.6.2 - debugger-4.2.7 - dialyzer-4.1 - diameter-2.2.1 - edoc-0.11 - eldap-1.2.8 - erl_docgen-0.10 - erl_interface-3.13 - erts-10.5.6 - et-1.6.4 - eunit-2.3.8 - ftp-1.0.3 - hipe-3.19.1 - inets-7.1.1 - jinterface-1.10.1 - kernel-6.5 - megaco-3.18.6 - mnesia-4.16.1 - observer-2.9.2 - odbc-2.12.4 - os_mon-2.5.1 - parsetools-2.1.8 - public_key-1.7 - reltool-0.8 - runtime_tools-1.14 - sasl-3.4.1 - ssh-4.8 - ssl-9.4 - stdlib-3.10 - syntax_tools-2.2.1 - tftp-1.0.1 - tools-3.2.1 - wx-1.8.9 - xmerl-1.3.22 * tag 'OTP-22.1.8.1': Updated OTP version Prepare release # Conflicts: # OTP_VERSION # lib/snmp/doc/src/notes.xml # lib/snmp/vsn.mk # make/otp_version_tickets # otp_versions.table
| | * | | | Prepare releaseErlang/OTP2020-01-091-1/+2
| | | | | |
View Lorry Controller Status