summaryrefslogtreecommitdiff
path: root/keymanager/changes/feature-6299_new_doc
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2014-11-25 12:30:40 -0200
committerdrebs <drebs@leap.se>2014-11-25 12:30:40 -0200
commit930bb9db48d31b7ad2528564ca7d23fb696f1899 (patch)
treec62b21cfba0d88e6eda3f202561bdf9404344152 /keymanager/changes/feature-6299_new_doc
parent27d2c307b31dd72705323e835d879c7654d5cac1 (diff)
parentb40e61f4d7624250325378d51a289a92773e785c (diff)
Merge branch 'feature/6299_new_doc' into develop
Diffstat (limited to 'keymanager/changes/feature-6299_new_doc')
-rw-r--r--keymanager/changes/feature-6299_new_doc2
1 files changed, 2 insertions, 0 deletions
diff --git a/keymanager/changes/feature-6299_new_doc b/keymanager/changes/feature-6299_new_doc
new file mode 100644
index 0000000..c893338
--- /dev/null
+++ b/keymanager/changes/feature-6299_new_doc
@@ -0,0 +1,2 @@
+- new soledad doc struct for encryption-keys (closes #6299)
+- keep old key after upgrade (closes #6262)