Merge commit 'pnasrat/tickets/1422'

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/facter/util/resolution.rb b/lib/facter/util/resolution.rb
index 4d0a8d1..19f2c1e 100644
--- a/lib/facter/util/resolution.rb
+++ b/lib/facter/util/resolution.rb
@@ -67,7 +67,7 @@ class Facter::Util::Resolution
         @name = name
         @confines = []
         @value = nil
-        @timeout = 0.5
+        @timeout = 0
     end
 
     # Return the number of confines.
diff --git a/spec/unit/util/resolution.rb b/spec/unit/util/resolution.rb
index 617b4dc..5ce3d63 100755
--- a/spec/unit/util/resolution.rb
+++ b/spec/unit/util/resolution.rb
@@ -21,8 +21,8 @@ describe Facter::Util::Resolution do
         Facter::Util::Resolution.new("yay").should respond_to(:timeout=)
     end
 
-    it "should default to a timeout of 0.5 seconds" do
-        Facter::Util::Resolution.new("yay").limit.should == 0.5
+    it "should default to a timeout of 0 seconds" do
+        Facter::Util::Resolution.new("yay").limit.should == 0
     end
 
     it "should provide a 'limit' method that returns the timeout" do