otp.git/make, branch maint Mirror of Erlang/OTP repository. Merge branch 'maint-21' into maint 2019-07-12T09:43:54+00:00 Raimo Niskanen raimo@erlang.org 2019-07-12T09:43:54+00:00 7e77fb475fb8054b19e8e5ed3ed81d2c5950a0ff * 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 
* 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 2019-07-11T15:18:53+00:00 Erlang/OTP otp@erlang.org 2019-07-11T15:18:53+00:00 61daf50ebe9f82678781ee45a3afe0cd40ddcf47 






Merge branch 'maint-22' into maint
2019-07-11T09:24:19+00:00

John Högberg
john@erlang.org

2019-07-11T09:24:19+00:00

220eeb3670e536b55c8e6812de86481cedd83bfe

* maint-22:
  Updated OTP version
  Prepare release

# Conflicts:
#	make/otp_version_tickets





* maint-22:
  Updated OTP version
  Prepare release

# Conflicts:
#	make/otp_version_tickets







Prepare release
2019-07-10T16:05:13+00:00

Erlang/OTP
otp@erlang.org

2019-07-10T16:05:13+00:00

79adc5c28cd0c78af389ff5e8181abf8fbf17844












Merge branch 'maint-22' into maint
2019-07-10T08:11:17+00:00

John Högberg
john@erlang.org

2019-07-10T08:11:17+00:00

4e9792256a754ff10f6a214f582fbb58e081deb2

* maint-22:
  Updated OTP version
  Prepare release

# Conflicts:
#	make/otp_version_tickets





* maint-22:
  Updated OTP version
  Prepare release

# Conflicts:
#	make/otp_version_tickets







Prepare release
2019-07-09T07:52:19+00:00

Erlang/OTP
otp@erlang.org

2019-07-09T07:52:19+00:00

20e26498ff75c4689a68e11e28016ae5fe44d791












Merge branch 'bmk/erts/esock/20190614/split_modules/OTP-15765' into maint
2019-07-08T13:28:16+00:00

Micael Karlberg
bmk@erlang.org

2019-07-08T13:28:16+00:00

b40524bc9c0be4c11da28435e497c2a7c1f5368e












Merge branch 'maint-22' into maint
2019-07-03T08:31:58+00:00

John Högberg
john@erlang.org

2019-07-03T08:31:58+00:00

b0a8268780f3f24cbfd9698a0ca08d166bbbd798

* maint-22:
  Updated OTP version
  Prepare release

# Conflicts:
#	make/otp_version_tickets





* maint-22:
  Updated OTP version
  Prepare release

# Conflicts:
#	make/otp_version_tickets







Merge branch 'maint-21' into maint
2019-07-03T08:11:10+00:00

John Högberg
john@erlang.org

2019-07-03T08:11:10+00:00

9e49cf35723d7436dbd0ec2f3c8da165b6eb906a

* 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





* 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
2019-07-02T11:44:49+00:00

Erlang/OTP
otp@erlang.org

2019-07-02T11:44:49+00:00

61b5e7f0f1bc7695a181b9c72de5970b4a4a5502