aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2010-12-02 12:21:49 +0100
committerIngela Anderton Andin <[email protected]>2010-12-02 12:21:49 +0100
commitef489eff777d7da5f965f49c2f0ed71d42173825 (patch)
tree47cae8a3ff391eb3c75cc9f1a0ebdff7f35de57e
parentb3f18a3df707c53c8ba430a15a18f83cee55d5c0 (diff)
parent02008908320291e31c8e204cb96ee42265edf2fa (diff)
downloadotp-ef489eff777d7da5f965f49c2f0ed71d42173825.tar.gz
otp-ef489eff777d7da5f965f49c2f0ed71d42173825.tar.bz2
otp-ef489eff777d7da5f965f49c2f0ed71d42173825.zip
Merge branch 'ia/public_key/app-upp/public_key-0.10' into dev
* ia/public_key/app-upp/public_key-0.10: Prepare for release
-rw-r--r--lib/public_key/src/public_key.appup.src12
-rw-r--r--lib/public_key/vsn.mk2
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/public_key/src/public_key.appup.src b/lib/public_key/src/public_key.appup.src
index 0f9f62d2f6..6b6b76d0a5 100644
--- a/lib/public_key/src/public_key.appup.src
+++ b/lib/public_key/src/public_key.appup.src
@@ -1,6 +1,12 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {"0.9",
+ [
+ {update, public_key, soft, soft_purge, soft_purge, []},
+ {update, pubkey_cert, soft, soft_purge, soft_purge, []}
+ ]
+ },
{"0.8",
[
{update, 'OTP-PUB-KEY', soft, soft_purge, soft_purge, []},
@@ -12,6 +18,12 @@
}
],
[
+ {"0.9",
+ [
+ {update, public_key, soft, soft_purge, soft_purge, []},
+ {update, pubkey_cert, soft, soft_purge, soft_purge, []}
+ ]
+ },
{"0.8",
[
{update, 'OTP-PUB-KEY', soft, soft_purge, soft_purge, []},
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 2810942171..334b9d792e 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 0.9
+PUBLIC_KEY_VSN = 0.10