aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/src
diff options
context:
space:
mode:
authorKenneth Lundin <[email protected]>2011-03-08 17:26:32 +0100
committerKenneth Lundin <[email protected]>2011-03-08 17:26:32 +0100
commit00eac4ea859ea5cade4942dc8219355d7bca6149 (patch)
tree6504c7b5cb148ee9e7defc6fa677271c9f8c10e1 /lib/public_key/src
parent26d701c1c334d41a43712b71c11d61995cecd279 (diff)
parentdea83e25a671b0bc2661582c3227c1728d69bfea (diff)
downloadotp-00eac4ea859ea5cade4942dc8219355d7bca6149.tar.gz
otp-00eac4ea859ea5cade4942dc8219355d7bca6149.tar.bz2
otp-00eac4ea859ea5cade4942dc8219355d7bca6149.zip
Merge branch 'dev' of super:otp into dev
Diffstat (limited to 'lib/public_key/src')
-rw-r--r--lib/public_key/src/public_key.appup.src26
1 files changed, 20 insertions, 6 deletions
diff --git a/lib/public_key/src/public_key.appup.src b/lib/public_key/src/public_key.appup.src
index 6b6b76d0a5..c65ac7bc99 100644
--- a/lib/public_key/src/public_key.appup.src
+++ b/lib/public_key/src/public_key.appup.src
@@ -1,6 +1,13 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {"0.10",
+ [
+ {update, public_key, soft, soft_purge, soft_purge, []},
+ {update, pubkey_pem, soft, soft_purge, soft_purge, []},
+ {update, pubkey_cert_records, soft, soft_purge, soft_purge, []}
+ ]
+ },
{"0.9",
[
{update, public_key, soft, soft_purge, soft_purge, []},
@@ -18,12 +25,19 @@
}
],
[
- {"0.9",
- [
+ {"0.10",
+ [
+ {update, public_key, soft, soft_purge, soft_purge, []},
+ {update, pubkey_pem, soft, soft_purge, soft_purge, []},
+ {update, pubkey_cert_records, soft, soft_purge, soft_purge, []}
+ ]
+ },
+ {"0.9",
+ [
{update, public_key, soft, soft_purge, soft_purge, []},
- {update, pubkey_cert, soft, soft_purge, soft_purge, []}
- ]
- },
+ {update, pubkey_cert, soft, soft_purge, soft_purge, []}
+ ]
+ },
{"0.8",
[
{update, 'OTP-PUB-KEY', soft, soft_purge, soft_purge, []},
@@ -32,5 +46,5 @@
{update, pubkey_cert_records, soft, soft_purge, soft_purge, []},
{update, pubkey_cert, soft, soft_purge, soft_purge, []}
]
- }
+ }
]}.