diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-09 15:51:48 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-09 15:51:48 -0800 |
| commit | 54d742235279863ba455900e053ecdc2b764e564 (patch) | |
| tree | 72adf8592ef8f94293954db2f3155ad0b8345082 /lib/facter/virtual.rb | |
| parent | 7e35d98964b3534281b3d1f164e548a86fce18dd (diff) | |
| parent | 7cec60af2fbbcb654b0b415fb441d0ee2f197699 (diff) | |
| download | facter-54d742235279863ba455900e053ecdc2b764e564.tar.gz facter-54d742235279863ba455900e053ecdc2b764e564.tar.xz facter-54d742235279863ba455900e053ecdc2b764e564.zip | |
Merge remote branch 'stschulte/ticket/master/5016' into next
Manually resolved conflicts:
lib/facter/virtual.rb
spec/unit/virtual.rb
Diffstat (limited to 'lib/facter/virtual.rb')
| -rw-r--r-- | lib/facter/virtual.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb index af530e5..242422c 100644 --- a/lib/facter/virtual.rb +++ b/lib/facter/virtual.rb @@ -80,7 +80,7 @@ Facter.add("is_virtual") do setcode do case Facter.value(:virtual) - when "xenu", "openvzve", "vmware", "kvm", "vserver", "jail" + when "xenu", "openvzve", "vmware", "kvm", "vserver", "jail", "zone" "true" else "false" |