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, 4 insertions, 4 deletions

diff --git a/test/util/settings.rb b/test/util/settings.rb
index de6fff946..94b01c80e 100755
--- a/test/util/settings.rb
+++ b/test/util/settings.rb
@@ -995,12 +995,12 @@ yay = /a/path
     def test_celement_short_name
         element = nil
         assert_nothing_raised("Could not create celement") do
-            element = CElement.new :short => "n", :desc => "anything"
+            element = CElement.new :short => "n", :desc => "anything", :settings => Puppet::Util::Settings.new
         end
         assert_equal("n", element.short, "Short value is not retained")
 
         assert_raise(ArgumentError,"Allowed multicharactered short names.") do
-            element = CElement.new :short => "no", :desc => "anything"
+            element = CElement.new :short => "no", :desc => "anything", :settings => Puppet::Util::Settings.new
         end
     end
 
@@ -1025,13 +1025,13 @@ yay = /a/path
 
     # Tell getopt which arguments are valid
     def test_get_getopt_args
-        element = CElement.new :name => "foo", :desc => "anything"
+        element = CElement.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new
         assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")
         
         element.short = "n"
         assert_equal([["--foo", "-n", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")
 
-        element = CBoolean.new :name => "foo", :desc => "anything"
+        element = CBoolean.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new
         assert_equal([["--foo", GetoptLong::NO_ARGUMENT], ["--no-foo", GetoptLong::NO_ARGUMENT]],
                      element.getopt_args, "Did not produce appropriate getopt args")