gistfile1.txt

/Users/luke/puppet/lib/puppet/util/settings.rb:62:in `optparse_addargs': undefined method `args=' for Puppet:Module (NoMethodError)
	from /Users/luke/puppet/lib/puppet/application.rb:251:in `parse_options'
	from /Users/luke/puppet/lib/puppet/application.rb:214:in `run'
	from bin/puppetmasterd:66

-------------

The fix is:

diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index de8e91b..b814bd3 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -58,9 +58,6 @@ class Puppet::Util::Settings
     # Generate the list of valid arguments, in a format that OptionParser can
     # understand, and add them to the passed option list.
     def optparse_addargs(options)
-        # Hackish, but acceptable.  Copy the current ARGV for restarting.
-        Puppet.args = ARGV.dup
-
         # Add all of the config parameters as valid options.
         self.each { |name, element|
             options << element.optparse_args