Merge remote branch 'stschulte/ticket/master/5016' into next

Manually resolved conflicts:
	lib/facter/virtual.rb
	spec/unit/virtual.rb

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/unit/virtual.rb b/spec/unit/virtual.rb
index 80cd0d9..b79ced7 100644
--- a/spec/unit/virtual.rb
+++ b/spec/unit/virtual.rb
@@ -68,4 +68,10 @@ describe "is_virtual fact" do
         Facter.fact(:is_virtual).value.should == "true"
     end
 
+    it "should be true when running in zone" do
+        Facter.fact(:kernel).stubs(:value).returns("SunOS")
+        Facter.fact(:virtual).stubs(:value).returns("zone")
+        Facter.fact(:is_virtual).value.should == "true"
+    end
+
 end