otp.git, branch OTP_R14B04 Mirror of Erlang/OTP repository. Prepare release 2011-10-04T10:06:58+00:00 Erlang/OTP otp@erlang.org 2011-10-04T10:06:58+00:00 b6dc1a844eab061d0a7153d46e7e68296f15a504 






Merge branch 'maint-r14' into dev
2011-10-04T10:01:32+00:00

Sverker Eriksson
sverker@erlang.org

2011-10-04T10:00:08+00:00

3d6153cb2d3a08f9b82a3ea52e69c5442c226559

Fake merge with "-s ours"





Fake merge with "-s ours"







Prepare release
2011-10-04T09:07:10+00:00

Erlang/OTP
otp@erlang.org

2011-10-04T09:07:10+00:00

9102b1733eb4e71333a521763aeff32a59de9672












Merge branch 'sverker/crypto-openssl.0.9.8-PPC/OTP-9603' into maint-r14
2011-10-04T09:06:52+00:00

Erlang/OTP
otp@erlang.org

2011-10-04T09:06:52+00:00

7b3131376cab0d87da21359fb703dd44da10c3a2

* sverker/crypto-openssl.0.9.8-PPC/OTP-9603:
  [ssl] Step version for patch 1178
  Touch crypto to provoke patch release (again)





* sverker/crypto-openssl.0.9.8-PPC/OTP-9603:
  [ssl] Step version for patch 1178
  Touch crypto to provoke patch release (again)







Merge branch 'maint-r14' into dev
2011-10-04T08:54:05+00:00

Raimo Niskanen
raimo@erlang.org

2011-10-04T08:54:05+00:00

775ecf4a33522577bf99085053b8e6b241457f3e












Merge branch 'maint-r13' into maint-r14
2011-10-04T08:53:16+00:00

Raimo Niskanen
raimo@erlang.org

2011-10-04T08:53:16+00:00

fe70b621ae06e79549b448ddbd6a6b3d866a58f4

Conflicts:
	erts/doc/src/notes.xml
	erts/emulator/drivers/common/inet_drv.c
	erts/vsn.mk
	lib/kernel/test/gen_sctp_SUITE.erl





Conflicts:
	erts/doc/src/notes.xml
	erts/emulator/drivers/common/inet_drv.c
	erts/vsn.mk
	lib/kernel/test/gen_sctp_SUITE.erl







[ssl] Step version for patch 1178
2011-10-03T09:31:00+00:00

Sverker Eriksson
sverker@erlang.org

2011-10-03T09:31:00+00:00

7a087c36e29cc1d12c856054a94772e86b95ee06

No source change. Building with dynamic linking towards OpenSSL v0.9.8





No source change. Building with dynamic linking towards OpenSSL v0.9.8







Touch crypto to provoke patch release (again)
2011-09-30T17:51:59+00:00

Sverker Eriksson
sverker@erlang.org

2011-09-30T17:49:19+00:00

b69adb23ccc7e05ca3e15f4c765d20da5225b337












Merge branch 'peppe/common_test/r14b04_docs' into dev
2011-09-30T11:56:43+00:00

Peter Andersson
peppe@erlang.org

2011-09-30T11:56:43+00:00

1a42cde6d62a8ec0f9e22215d3c3ec655201c78f

* peppe/common_test/r14b04_docs:
  Update documentation
  Rid ct_telnet of doc build warnings





* peppe/common_test/r14b04_docs:
  Update documentation
  Rid ct_telnet of doc build warnings







Update documentation
2011-09-30T11:26:59+00:00

Peter Andersson
peppe@erlang.org

2011-09-30T11:26:59+00:00

09fbbccd5a8638601e44c605cd887f90b85d7d60

OTP-9396
OTP-9372
OTP-9155





OTP-9396
OTP-9372
OTP-9155