aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-04-15 10:54:14 +0200
committerIngela Anderton Andin <[email protected]>2011-04-15 10:54:14 +0200
commit344c8180c2f8197056b384b136520deef9049a1a (patch)
tree7ca077de1d4a0596fb855c221ee0fce532be9afa
parent1d7a91c9703d61413420562c37dc28a90a1f040b (diff)
parent09a7359902f638f98b0f59968c4253caa44eb0d5 (diff)
downloadotp-344c8180c2f8197056b384b136520deef9049a1a.tar.gz
otp-344c8180c2f8197056b384b136520deef9049a1a.tar.bz2
otp-344c8180c2f8197056b384b136520deef9049a1a.zip
Merge branch 'ia/public_key/prepare-for-release' into dev
* ia/public_key/prepare-for-release: Prepare for release
-rw-r--r--lib/public_key/src/public_key.appup.src20
-rw-r--r--lib/public_key/vsn.mk2
2 files changed, 21 insertions, 1 deletions
diff --git a/lib/public_key/src/public_key.appup.src b/lib/public_key/src/public_key.appup.src
index c65ac7bc99..4986801dad 100644
--- a/lib/public_key/src/public_key.appup.src
+++ b/lib/public_key/src/public_key.appup.src
@@ -1,6 +1,16 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {"0.11",
+ [
+ {update, public_key, soft, soft_purge, soft_purge, []},
+ {update, pubkey_pem, soft, soft_purge, soft_purge, []},
+ {add_module, pubkey_ssh, soft, soft_purge, soft_purge},
+ {update, pubkey_cert, soft, soft_purge, soft_purge, []},
+ {update, pubkey_cert_records, soft, soft_purge, soft_purge, []}
+ ]
+ },
+
{"0.10",
[
{update, public_key, soft, soft_purge, soft_purge, []},
@@ -25,6 +35,16 @@
}
],
[
+ {"0.11",
+ [
+ {update, public_key, soft, soft_purge, soft_purge, []},
+ {update, pubkey_pem, soft, soft_purge, soft_purge, []},
+ {delete_module, pubkey_ssh, soft, soft_purge, soft_purge},
+ {update, pubkey_cert, soft, soft_purge, soft_purge, []},
+ {update, pubkey_cert_records, soft, soft_purge, soft_purge, []}
+ ]
+ },
+
{"0.10",
[
{update, public_key, soft, soft_purge, soft_purge, []},
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index c99fd6fee1..3c6b012152 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 0.11
+PUBLIC_KEY_VSN = 0.12