diff options
author | Joey Hess <joey@kitenet.net> | 2014-04-17 20:11:23 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-04-17 20:11:23 -0400 |
commit | 3d25c25171204e6d761d457f777283664398acc1 (patch) | |
tree | 726da1c9c058c191226db5f7e73be74dd0ffc466 | |
parent | 71b61ff9f3b06e9e4a0d455e8855005b535dc16e (diff) | |
parent | a19293732d02f6437758c5f269f7a17240adebe4 (diff) |
Merge branch 'joeyconfig'
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | propellor.cabal | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index e7654a07..41e6fe55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -propellor (0.3.1) UNRELEASED; urgency=medium +propellor (0.3.1) unstable; urgency=medium * Merge scheduler bug fix from git-annex. * Support for provisioning hosts with ssh and gpg keys. @@ -10,8 +10,10 @@ propellor (0.3.1) UNRELEASED; urgency=medium * Standard apt configuration for stable now includes backports. * Cron jobs generated by propellor use flock(1) to avoid multiple instances running at a time. + * Add support for SSH ed25519 keys. + (Thanks, Franz Pletz.) - -- Joey Hess <joeyh@debian.org> Fri, 11 Apr 2014 15:00:11 -0400 + -- Joey Hess <joeyh@debian.org> Thu, 17 Apr 2014 20:07:33 -0400 propellor (0.3.0) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index 482f2de6..ad171b5e 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 0.3.0 +Version: 0.3.1 Cabal-Version: >= 1.6 License: GPL Maintainer: Joey Hess <joey@kitenet.net> |