summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-08-15 15:02:56 -0700
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-08-15 15:02:56 -0700
commitcb05f332e617e346aa533d6dde02fb11c6148799 (patch)
treeacec015412602245075ac2f1e85c144c6cebd7e2 /debian/changelog
parent8cf936aa9d62f6e8655904375a2d8217f559947a (diff)
parentb0ea15c8e359a908583e08da0663d69e353c77dc (diff)
Merge commit 'dkg/master'
Conflicts: src/monkeysphere-server Resolved conflicts in revoke-hostname, and finish work on them.
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog4
1 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index e80e48a..b39ba44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ monkeysphere (0.8-1) UNRELEASED; urgency=low
of my own.
* More monkeysphere-server diagnostics
* monkeysphere --gen-subkey now guesses what KeyID you meant.
+ * set up host-key revocation
[ Jameson Graef Rollins ]
* fix another bug for when ssh key files are missing.
@@ -13,8 +14,9 @@ monkeysphere (0.8-1) UNRELEASED; urgency=low
be removed from key files.
* enabled host key publication.
* added checking of gpg.conf for keyserver
+ * new functions to add/revoke host key user IDs
- -- Jameson Graef Rollins <jrollins@phys.columbia.edu> Fri, 15 Aug 2008 10:46:23 -0700
+ -- Jameson Graef Rollins <jrollins@phys.columbia.edu> Fri, 15 Aug 2008 15:02:48 -0700
monkeysphere (0.7-1) experimental; urgency=low