[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Paul Berry]

The following commit has been merged in the experimental branch:
commit 4fb675d3e028c2429f4fa56bf172d60127c9e608
Merge: d4d51e3d7720108c063505884cca015aff77eff1 c5a1ca0b34a57366415df60099ab0918a7579469
Author: Paul Berry <paul at puppetlabs.com>
Date:   Mon Dec 6 13:28:28 2010 -0800

    Merge remote branch 'someword/feature/master/5391' into next
    
    * someword/feature/master/5391:
      (#5391) Include additional zfs properties

diff --combined spec/unit/provider/zfs/solaris_spec.rb
index 75f1605,9d1f364..4998ba6
--- a/spec/unit/provider/zfs/solaris_spec.rb
+++ b/spec/unit/provider/zfs/solaris_spec.rb
@@@ -1,6 -1,6 +1,6 @@@
  #!/usr/bin/env ruby
  
 -require File.dirname(__FILE__) + '/../../../spec_helper'
 +require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
  
  provider_class = Puppet::Type.type(:zfs).provider(:solaris)
  
@@@ -75,7 -75,7 +75,7 @@@ describe provider_class d
  
    end
  
-   [:mountpoint, :compression, :copies, :quota, :reservation, :sharenfs, :snapdir].each do |prop|
+   [:mountpoint, :recordsize, :aclmode, :aclinherit, :primarycache, :secondarycache, :compression, :copies, :quota, :reservation, :sharenfs, :snapdir].each do |prop|
      describe "when getting the #{prop} value" do
        it "should call zfs with :get, #{prop} and this zfs" do
          @provider.expects(:zfs).with(:get, "-H", "-o", "value", prop, @resource[:name]).returns("value\n")

-- 
Puppet packaging for Debian