summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-04 11:22:53 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-04 11:22:53 -0300
commit270af39ef825f010f40ab7f5317578a7d4a18fdf (patch)
tree0c337c2ec30e967fa49db25c166b7b8133ddccee
parent4fabbf0cb2e7fc0b3dc7c00ddbd6a3a87fc4b654 (diff)
Fold in changes
-rw-r--r--keymanager/CHANGELOG4
-rw-r--r--keymanager/changes/bug_enforce_correct_version1
-rw-r--r--keymanager/changes/feature_2342-use-new-gnupg-module1
3 files changed, 4 insertions, 2 deletions
diff --git a/keymanager/CHANGELOG b/keymanager/CHANGELOG
index 9cd53b3..6ec2624 100644
--- a/keymanager/CHANGELOG
+++ b/keymanager/CHANGELOG
@@ -1,3 +1,7 @@
+0.3.3 Oct 4:
+ o Add a sanity check for the correct version of gnupg.
+ o Update code to use gnupg 1.2.2 python module. Closes #2342.
+
0.3.2 Sep 6:
o Do not raise exception when a GET request doesn't return 2XX
code. Nickserver uses error codes for more verbosity in the
diff --git a/keymanager/changes/bug_enforce_correct_version b/keymanager/changes/bug_enforce_correct_version
deleted file mode 100644
index eb03e41..0000000
--- a/keymanager/changes/bug_enforce_correct_version
+++ /dev/null
@@ -1 +0,0 @@
- o Add a sanity check for the correct version of gnupg.
diff --git a/keymanager/changes/feature_2342-use-new-gnupg-module b/keymanager/changes/feature_2342-use-new-gnupg-module
deleted file mode 100644
index b83e8ec..0000000
--- a/keymanager/changes/feature_2342-use-new-gnupg-module
+++ /dev/null
@@ -1 +0,0 @@
- o Update code to use gnupg 1.2.2 python module. Closes #2342.