diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-03-08 10:03:35 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-03-08 10:03:35 +0100 |
| commit | 6257d0eb9eb8485c31b41b9e07bfe398ee17f8a4 (patch) | |
| tree | 8f4d935c50b6623c97800077e7da6597f947a443 | |
| parent | 0edb60a6cd946de768690fa945c1a0f655accc10 (diff) | |
| parent | 829d8a7faa0795d9980f06a9903728d50abe6dc2 (diff) | |
| download | otp-6257d0eb9eb8485c31b41b9e07bfe398ee17f8a4.tar.gz otp-6257d0eb9eb8485c31b41b9e07bfe398ee17f8a4.tar.bz2 otp-6257d0eb9eb8485c31b41b9e07bfe398ee17f8a4.zip | |
Merge branch 'ia/public_key/prepare-release' into dev
* ia/public_key/prepare-release:
Prepare for release
| -rw-r--r-- | lib/public_key/src/public_key.appup.src | 26 | ||||
| -rw-r--r-- | lib/public_key/vsn.mk | 2 |
2 files changed, 21 insertions, 7 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, []} ] - } + } ]}. diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk index 334b9d792e..c99fd6fee1 100644 --- a/lib/public_key/vsn.mk +++ b/lib/public_key/vsn.mk @@ -1 +1 @@ -PUBLIC_KEY_VSN = 0.10 +PUBLIC_KEY_VSN = 0.11 |