aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key
diff options
context:
space:
mode:
authorHenrik <[email protected]>2018-05-29 10:47:25 +0200
committerHenrik <[email protected]>2018-05-29 10:47:25 +0200
commitb9faca269de1de51ae33577cc204befbea24243c (patch)
tree5b0dedddf524df00c0377927c767ac2a25c3794f /lib/public_key
parentd3b4568f6d910eb4ce26b7a899c8c414ae252386 (diff)
downloadotp-b9faca269de1de51ae33577cc204befbea24243c.tar.gz
otp-b9faca269de1de51ae33577cc204befbea24243c.tar.bz2
otp-b9faca269de1de51ae33577cc204befbea24243c.zip
Revert "Prepare release"
This reverts commit fd8e49b5bddceaae803670121b603b5eee8c5c08.
Diffstat (limited to 'lib/public_key')
-rw-r--r--lib/public_key/doc/src/notes.xml36
-rw-r--r--lib/public_key/vsn.mk2
2 files changed, 1 insertions, 37 deletions
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index df1c83d8f2..11012ee9e5 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,42 +35,6 @@
<file>notes.xml</file>
</header>
-<section><title>Public_Key 1.6</title>
-
- <section><title>Fixed Bugs and Malfunctions</title>
- <list>
- <item>
- <p>
- Update calls to the base64 module to conform to that
- module's type specifications.</p>
- <p>
- Own Id: OTP-14788 Aux Id: OTP-14624 </p>
- </item>
- </list>
- </section>
-
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- Use uri_string module instead of http_uri.</p>
- <p>
- Own Id: OTP-14902</p>
- </item>
- <item>
- <p>
- Compleate PKCS-8 encoding support and enhance the
- decoding of 'PrivateKeyInfo' to conform to the rest of
- Erlang public_key API.</p>
- <p>
- Own Id: OTP-15093</p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Public_Key 1.5.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index f7faadb8fb..99a0cc087e 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.6
+PUBLIC_KEY_VSN = 1.5.2