delta/erlang.git - github.com: erlang/otp.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'maint'	Lars Thorsen	2019-09-09	1	-1/+1
\|\
\| *	Support fop 2.1 in the build support for the documentation	Lars Thorsen	2019-09-09	1	-1/+1
\| \|
\| *	Merge branch 'maint-21' into maint	Raimo Niskanen	2019-07-12	1	-1/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # make/otp_version_tickets # otp_versions.table
\| \| *	Prepare release	Erlang/OTP	2019-07-11	1	-5/+1
\| \| \|
\| * \|	Merge branch 'maint-22' into maint	John Högberg	2019-07-11	1	-5/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
\| \| * \|	Prepare release	Erlang/OTP	2019-07-10	1	-5/+1
\| \| \| \|
\| * \| \|	Merge branch 'maint-22' into maint	John Högberg	2019-07-10	1	-10/+5
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
\| \| * \|	Prepare release	Erlang/OTP	2019-07-09	1	-10/+5
\| \| \| \|
* \| \| \|	Merge branch 'lukas/otp/add-dialyzer-make-target/OTP-15915'	Lukas Larsson	2019-08-06	1	-1/+42
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* lukas/otp/add-dialyzer-make-target/OTP-15915: otp: Add make dialyzer and make xmllint documentation Add 'make dialyzer' target to top and apps
\| * \| \| \|	Add 'make dialyzer' target to top and apps	Lukas Larsson	2019-06-26	1	-1/+42
\| \| \| \| \|
* \| \| \| \|	Merge branch 'maint'	Micael Karlberg	2019-07-08	1	-0/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| / / / \| \|/ / /
\| * \| \|	Merge branch 'bmk/erts/esock/20190614/split_modules/OTP-15765' into maint	Micael Karlberg	2019-07-08	1	-0/+4
\| \|\ \ \
\| \| * \| \|	[esock,kernel] net -> prim_net and add (new) net	Micael Karlberg	2019-06-14	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renamed the current preloaded net module to prim_net and removed the deprecated functions (call, cast, ...). Introduce a "new" net module (in kernel) as an interface module to the (preloaded) prim_net. This one also contains the deprecated functions (call, cast, ...). OTP-15765
\| * \| \| \|	Merge branch 'maint-22' into maint	John Högberg	2019-07-03	1	-0/+10
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
\| \| * \| \|	Prepare release	Erlang/OTP	2019-07-02	1	-6/+10
\| \| \| \| \|
\| * \| \| \|	Merge branch 'maint-21' into maint	John Högberg	2019-07-03	1	-6/+0
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # make/otp_version_tickets # otp_versions.table
\| \| * \| \|	Prepare release	Erlang/OTP	2019-07-02	1	-9/+5
\| \| \| \| \|
\| \| * \| \|	Prepare release	Erlang/OTP	2019-06-17	1	-6/+9
\| \| \| \| \|
\| * \| \| \|	Merge branch 'maint-22' into maint	John Högberg	2019-06-18	1	-0/+6
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
\| \| * \| \|	Prepare release	Erlang/OTP	2019-06-17	1	-9/+6
\| \| \| \| \|
\| * \| \| \|	Merge branch 'maint-20' into maint	John Högberg	2019-06-17	1	-9/+0
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-20: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/common_test/doc/src/notes.xml # lib/common_test/vsn.mk # lib/tools/doc/src/notes.xml # lib/tools/vsn.mk # make/otp_version_tickets # otp_versions.table
\| \| * \| \|	Prepare release	Erlang/OTP	2019-06-14	1	-12/+4
\| \| \| \| \|
\| * \| \| \|	Merge branch 'maint-22' into maint	John Högberg	2019-06-13	1	-0/+9
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
\| \| * \| \|	Prepare release	Erlang/OTP	2019-06-12	1	-11/+9
\| \| \| \| \|
\| * \| \| \|	Merge branch 'maint-21' into maint	Ingela Anderton Andin	2019-06-04	1	-11/+0
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/kernel/doc/src/notes.xml # lib/kernel/src/kernel.appup.src # lib/kernel/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # lib/stdlib/doc/src/notes.xml # lib/stdlib/src/stdlib.appup.src # lib/stdlib/vsn.mk # make/otp_version_tickets # otp_versions.table
\| \| * \| \|	Prepare release	Erlang/OTP	2019-06-03	1	-1/+6
\| \| \| \| \|
\| \| * \| \|	Prepare release	Erlang/OTP	2019-05-15	1	-3/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'maint-22' into maint	Hans Bolinder	2019-06-03	1	-2/+11
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
\| \| * \| \|	Prepare release	Erlang/OTP	2019-05-29	1	-2/+11
\| \| \| \| \|
\| * \| \| \|	Merge branch 'maint-22' into maint	Ingela Anderton Andin	2019-05-20	1	-0/+2
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
\| \| * \| \|	Prepare release	Erlang/OTP	2019-05-15	1	-147/+2
\| \| \| \| \|
* \| \| \| \|	Add "make test" command for root and application directories	Kjell Winblad	2019-06-26	2	-0/+279
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	The added make target is described in HOWTO/TESTING.md.
* \| \| \|	Merge branch 'maint-21' into maint	Ingela Anderton Andin	2019-05-15	1	-147/+1
\|\ \ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # lib/tools/doc/src/notes.xml # lib/tools/vsn.mk # make/otp_version_tickets # otp_versions.table
\| * \| \|	Prepare release	Erlang/OTP	2019-05-14	1	-8/+3
\| \| \| \|
* \| \| \|	Bump patch merge version	Rickard Green	2019-05-14	1	-1/+1
\| \|/ / \|/\| \|
* \| \|	Prepare release	Erlang/OTP	2019-05-10	1	-1/+147
\| \| \|
* \| \|	Merge branch 'maint'	Rickard Green	2019-05-09	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint: Bump forward merge script version
\| * \| \|	Bump forward merge script version	Rickard Green	2019-05-09	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'maint-21' into maint	Ingela Anderton Andin	2019-05-07	1	-1/+8
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-21: Updated OTP version Prepare release
\| \| * \|	Prepare release	Erlang/OTP	2019-05-06	1	-1/+8
\| \| \| \|
\| * \| \|	Merge branch 'maint-21' into maint	Hans Nilsson	2019-04-26	1	-1/+1
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-21: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
\| \| * \|	Prepare release	Erlang/OTP	2019-04-24	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'maint-21' into maint	Raimo Niskanen	2019-04-18	1	-0/+1
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-21: Updated OTP version Prepare release Conflicts: make/otp_version_tickets
\| \| * \|	Prepare release	Erlang/OTP	2019-04-17	1	-3/+1
\| \| \| \|
* \| \| \|	[socket] Preliminary - make socket configurable	Micael Karlberg	2019-04-30	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Preliminary work to make socket configurable (enable and disable). OTP-15658
* \| \| \|	Revert "Prepare release"	Rickard Green	2019-04-24	1	-136/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 425889ba69b69a9b6fb14bfbef121d51b78e853a.
* \| \| \|	Prepare release	Erlang/OTP	2019-04-23	1	-1/+136
\| \| \| \|
* \| \| \|	Merge branch 'maint'	Raimo Niskanen	2019-04-18	1	-1/+1
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	* maint: Bump otp_patch_solve_forward_merge_version
\| * \| \|	Bump otp_patch_solve_forward_merge_version	Raimo Niskanen	2019-04-18	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'maint-20' into maint	Micael Karlberg	2019-04-17	1	-3/+0
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* maint-20: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/common_test/doc/src/notes.xml # lib/common_test/vsn.mk # lib/erl_interface/doc/src/notes.xml # lib/erl_interface/vsn.mk # lib/snmp/doc/src/notes.xml # lib/snmp/vsn.mk # lib/ssh/doc/src/notes.xml # lib/ssh/vsn.mk # lib/tools/doc/src/notes.xml # lib/tools/vsn.mk # make/otp_version_tickets # otp_versions.table