[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5-303-gfcfa26a

[nfagerlund]

The following commit has been merged in the upstream branch:
commit c80a77d0d141cd933db3f4b124b992d767577f08
Author: nfagerlund <nick.fagerlund at gmail.com>
Date:   Mon Feb 28 10:30:19 2011 -0800

    (#6509) Inline docs: Fix broken code blocks in zpool type
    
    This one was subtle. If the first paragraph of a Markdown string embedded in a type isn't
    multiple lines, a code block immediately following it will not be recognized. So, hard-wrap or die, I guess.

diff --git a/lib/puppet/type/zpool.rb b/lib/puppet/type/zpool.rb
index df06522..40ee8f2 100755
--- a/lib/puppet/type/zpool.rb
+++ b/lib/puppet/type/zpool.rb
@@ -40,9 +40,10 @@ module Puppet
     end
 
     newproperty(:mirror, :array_matching => :all, :parent => Puppet::Property::MultiVDev) do
-      desc "List of all the devices to mirror for this pool. Each mirror should be a space separated string:
+      desc "List of all the devices to mirror for this pool. Each mirror should be a
+      space separated string:
 
-    mirror => [\"disk1 disk2\", \"disk3 disk4\"]
+          mirror => [\"disk1 disk2\", \"disk3 disk4\"],
 
       "
 
@@ -52,9 +53,10 @@ module Puppet
     end
 
     newproperty(:raidz, :array_matching => :all, :parent => Puppet::Property::MultiVDev) do
-      desc "List of all the devices to raid for this pool. Should be an array of space separated strings:
-      
-          raidz => [\"disk1 disk2\", \"disk3 disk4\"]
+      desc "List of all the devices to raid for this pool. Should be an array of
+      space separated strings:
+
+          raidz => [\"disk1 disk2\", \"disk3 disk4\"],
 
       "
 

-- 
Puppet packaging for Debian