[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit 5268487ac862eec6381d315800d6f56c51dc57b5
Author: Francois Deppierraz <francois at ctrlaltdel.ch>
Date:   Sat Sep 27 18:52:58 2008 +0200

    Fixed documentation, typo and added CHANGELOG entry

diff --git a/CHANGELOG b/CHANGELOG
index fec8ad6..66f40f6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -45,6 +45,8 @@
     Fixed #791 - You should now be able to create and find a user/group in one transaction.
 
     Fixed #1610 - Raise "Filebucketed" messages to Notice priority
+    
+    FIxed #1530 - ssh_authorized_keys provider does not crash anymore on SSH type 1 keys
 
     Added a number of confines to package providers
 
diff --git a/lib/puppet/type/ssh_authorized_key.rb b/lib/puppet/type/ssh_authorized_key.rb
index 1db4a0a..4afca1c 100644
--- a/lib/puppet/type/ssh_authorized_key.rb
+++ b/lib/puppet/type/ssh_authorized_key.rb
@@ -1,6 +1,7 @@
 module Puppet
     newtype(:ssh_authorized_key) do
-        @doc = "Manages ssh authorized keys."
+        @doc = "Manages SSH authorized keys. Currently only type 2 keys are
+        supported."
 
         ensurable
 
@@ -11,8 +12,7 @@ module Puppet
         end
 
         newproperty(:type) do
-            desc "The encryption type used.  Usually ssh-dss or ssh-rsa for
-                  SSH version 2. Not used for SSH version 1."
+            desc "The encryption type used: ssh-dss or ssh-rsa."
 
             newvalue("ssh-dss")
             newvalue("ssh-rsa")

-- 
Puppet packaging for Debian