otp.git/lib/public_key/doc, branch maint Mirror of Erlang/OTP repository. Merge branch 'maint-21' into maint 2019-06-18T07:42:33+00:00 John Högberg john@erlang.org 2019-06-18T07:42:33+00:00 39f0bd930bd028c5520da0430056994e4c5925c3 * maint-21: 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/kernel/doc/src/notes.xml # lib/kernel/vsn.mk # lib/public_key/doc/src/notes.xml # lib/public_key/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # lib/stdlib/doc/src/notes.xml # lib/stdlib/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/common_test/doc/src/notes.xml
#	lib/common_test/vsn.mk
#	lib/kernel/doc/src/notes.xml
#	lib/kernel/vsn.mk
#	lib/public_key/doc/src/notes.xml
#	lib/public_key/vsn.mk
#	lib/ssl/doc/src/notes.xml
#	lib/ssl/vsn.mk
#	lib/stdlib/doc/src/notes.xml
#	lib/stdlib/vsn.mk
#	make/otp_version_tickets
#	otp_versions.table
Prepare release 2019-06-17T14:50:25+00:00 Erlang/OTP otp@erlang.org 2019-06-17T14:50:25+00:00 8f9bf8a8c35e03fecfa8a035076772983ad0dc71 






public_key: Add AES to PBE2
2019-06-17T09:23:19+00:00

Ingela Anderton Andin
ingela@erlang.org

2019-05-28T17:39:47+00:00

1a58ece4788ce6ff89827019d085f62a47d9726d












public_key: Add AES to PBE2
2019-06-10T10:31:19+00:00

Ingela Anderton Andin
ingela@erlang.org

2019-05-28T17:39:47+00:00

20d0c9200862d5e725100b5b1bc26efb28a37a7d












Prepare release
2019-05-10T12:42:47+00:00

Erlang/OTP
otp@erlang.org

2019-05-10T12:42:47+00:00

36719f9798f1f7c2de203091582083e8d8e5726b












Merge branch 'maint'
2019-05-08T08:09:17+00:00

Rickard Green
rickard@erlang.org

2019-05-08T08:09:17+00:00

a85ee28f2b72a72da63ada2561e2dd53afdbf6d9

* maint:
  Fix bad merge from maint-21
  Fix bad merge from maint-21
  Updated OTP version
  Prepare release

# Conflicts:
#	OTP_VERSION
#	make/otp_version_tickets_in_merge





* maint:
  Fix bad merge from maint-21
  Fix bad merge from maint-21
  Updated OTP version
  Prepare release

# Conflicts:
#	OTP_VERSION
#	make/otp_version_tickets_in_merge







Prepare release
2019-05-06T15:09:17+00:00

Erlang/OTP
otp@erlang.org

2019-05-06T15:09:17+00:00

5aa950086a5fa036f27e670517a5c743e0610128












Merge pull request #2210 from omh/patch-1
2019-04-24T12:46:01+00:00

Ingela Andin
ingela@erlang.org

2019-04-24T12:46:01+00:00

ae53f331a31e6b56382f7b0a791a6f3644542a6a

`public_key:pem_decode` example wasn't using `pem_decode`




`public_key:pem_decode` example wasn't using `pem_decode`






Revert "Prepare release"
2019-04-24T12:29:10+00:00

Rickard Green
rickard@erlang.org

2019-04-24T12:29:10+00:00

0f2ddb633ffe97a92584edfbaf95d2dce3961cc8

This reverts commit 425889ba69b69a9b6fb14bfbef121d51b78e853a.





This reverts commit 425889ba69b69a9b6fb14bfbef121d51b78e853a.







Prepare release
2019-04-23T15:38:37+00:00

Erlang/OTP
otp@erlang.org

2019-04-23T15:38:37+00:00

425889ba69b69a9b6fb14bfbef121d51b78e853a