summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-10-29 12:02:09 -0400
committerKali Kaneko <kali@leap.se>2015-10-29 12:02:09 -0400
commitf17f8c43e217b65a951e5db357699c2d2af6098f (patch)
treebeec6dc6e28348a7d5f2bd1725c64eef4734ff80
parentc07bc537d68ec17c58ba44bc854318ecbf9b9787 (diff)
parentab0e4b91cf5919eec4347a4d20de9223d9882ac1 (diff)
Merge tag '0.4.3' into debian/experimental
Tag leap.keymanager version 0.4.3
-rw-r--r--CHANGELOG10
-rw-r--r--changes/bug-7410_fetch_key1
-rw-r--r--changes/bug-7498_multiple_keys1
-rw-r--r--changes/bug-address_mixup1
-rw-r--r--pkg/requirements-leap.pip2
5 files changed, 11 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7e416a6..0a9221d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+0.4.3 Oct 28, 2015:
+ o self-repair the keyring if keys get duplicated. Closes: #7498
+ o catch request exceptions on key fetching. Closes #7410.
+ o Don't repush a public key with different addres
+ o use async events api. Closes #7224.
+ o Use ca_bundle when fetching keys by url.
+ o add logging to fetch_key. Related: #7410.
+ o more verbosity in get_key wrong address log.
+ o don't repush a public key with different address. Related #7420.
+
0.4.2 Aug 26, 2015:
o Style changes.
o Tests updates.
diff --git a/changes/bug-7410_fetch_key b/changes/bug-7410_fetch_key
deleted file mode 100644
index 4aec9fe..0000000
--- a/changes/bug-7410_fetch_key
+++ /dev/null
@@ -1 +0,0 @@
-- catch request exceptions on key fetching
diff --git a/changes/bug-7498_multiple_keys b/changes/bug-7498_multiple_keys
deleted file mode 100644
index 90cf675..0000000
--- a/changes/bug-7498_multiple_keys
+++ /dev/null
@@ -1 +0,0 @@
-- self-repair the keyring if keys get duplicated (Closes: #7485)
diff --git a/changes/bug-address_mixup b/changes/bug-address_mixup
deleted file mode 100644
index 24170c9..0000000
--- a/changes/bug-address_mixup
+++ /dev/null
@@ -1 +0,0 @@
-- Don't repush a public key with different address
diff --git a/pkg/requirements-leap.pip b/pkg/requirements-leap.pip
index b311859..4ba1d81 100644
--- a/pkg/requirements-leap.pip
+++ b/pkg/requirements-leap.pip
@@ -1 +1 @@
-leap.common>=0.4.0
+leap.common>=0.4.3