Merge branch '0.24.x'

Conflicts:

	bin/puppetca
	lib/puppet/type/group.rb
	lib/puppet/type/tidy.rb
	lib/puppet/util/settings.rb

Also edited the following files so tests will pass:

       lib/puppet/type/component.rb
       spec/unit/ssl/certificate_request.rb
       spec/unit/type/computer.rb
       spec/unit/type/mcx.rb
       spec/unit/type/resources.rb
       spec/unit/util/settings.rb
       spec/unit/util/storage.rb
       test/ral/type/zone.rb

1 files changed, 5 insertions, 0 deletions

diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb
index 1046617ec..9bd26ac07 100755
--- a/test/network/handler/fileserver.rb
+++ b/test/network/handler/fileserver.rb
@@ -976,6 +976,11 @@ allow *
         }
 
         dir = tempfile()
+
+        # When mocks attack, part 2
+        kernel_fact = Facter.value(:kernel)
+        Facter.stubs(:value).with(:kernel).returns(kernel_fact)
+
         Facter.stubs(:value).with(:ipaddress).returns("127.0.0.1")
         Facter.stubs(:value).with { |v| v.to_s == "hostname" }.returns("myhost")
         Facter.stubs(:value).with { |v| v.to_s == "domain" }.returns("mydomain.com")