summaryrefslogtreecommitdiffstats
path: root/lib/puppet/provider
diff options
context:
space:
mode:
authorDaniel Pittman <daniel@puppetlabs.com>2011-05-12 12:02:21 -0700
committerDaniel Pittman <daniel@puppetlabs.com>2011-05-12 12:02:21 -0700
commit058cc39227112cefc637d38fd67d471945b2d4aa (patch)
tree9bb4a6f963f973b439e0dbe5c348e9497aef06fe /lib/puppet/provider
parentf80afbe72b848fe4ed81d8116d4eeb494aa6f61e (diff)
parent1f438da968e1583d900903407c2e5b17648fa937 (diff)
Merge branch '2.6.x' into 2.7.next
Fix conflicts in the changelog, and one agent spec in favour of the 2.7.next version of the code. Paired-With: Jacob Helwig <jacob@puppetlabs.com>
Diffstat (limited to 'lib/puppet/provider')
-rwxr-xr-xlib/puppet/provider/mount/parsed.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/provider/mount/parsed.rb b/lib/puppet/provider/mount/parsed.rb
index 11c5e21a9..7c3f41bbd 100755
--- a/lib/puppet/provider/mount/parsed.rb
+++ b/lib/puppet/provider/mount/parsed.rb
@@ -18,7 +18,7 @@ Puppet::Type.type(:mount).provide(
commands :mountcmd => "mount", :umount => "umount"
- case Facter["operatingsystem"]
+ case Facter.value(:operatingsystem)
when "Solaris"
@fields = [:device, :blockdevice, :name, :fstype, :pass, :atboot, :options]
else