Merge branch '0.24.x'

Conflicts:

	CHANGELOG
	spec/integration/defaults.rb
	spec/integration/node/catalog.rb
	spec/unit/rails.rb
	spec/unit/type/mount.rb

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/integration/node/catalog.rb b/spec/integration/node/catalog.rb
index b0e651511..285b85869 100755
--- a/spec/integration/node/catalog.rb
+++ b/spec/integration/node/catalog.rb
@@ -8,6 +8,12 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 describe Puppet::Node::Catalog do
     describe "when using the indirector" do
         after { Puppet::Util::Cacher.invalidate }
+        before do
+            # This is so the tests work w/out networking.
+            Facter.stubs(:to_hash).returns({"hostname" => "foo.domain.com"})
+            Facter.stubs(:value).returns("eh")
+        end
+
 
         it "should be able to delegate to the :yaml terminus" do
             Puppet::Node::Catalog.indirection.stubs(:terminus_class).returns :yaml