[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5rc1-120-g2247c80

[Matt Robinson]

The following commit has been merged in the upstream branch:
commit c4da5fcb0ef75f2baaffad5c84b3cfe6889dc58c
Merge: f34141477244564f31edde503a19b9fb898d986f 4d1b51fbcd7d7e285e7e56242951fcc821972e11
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Tue Feb 1 16:31:54 2011 -0800

    Merge branch 'tickets/2.6.x/5167' into 2.6.next
    
    * tickets/2.6.x/5167:
      Fixed #5167 - misleading documentation in the defaults of [main]

diff --combined lib/puppet/defaults.rb
index 400d59f,df359a7..764cbbe
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@@ -2,8 -2,8 +2,8 @@@
  module Puppet
    setdefaults(:main,
      :confdir => [Puppet.run_mode.conf_dir, "The main Puppet configuration directory.  The default for this parameter is calculated based on the user.  If the process
-     is running as root or the user that `puppet master` is supposed to run as, it defaults to a system directory, but if it's running as any other user,
-     it defaults to being in `~`."],
+     is running as root or the user that Puppet is supposed to run as, it defaults to a system directory, but if it's running as any other user,
+     it defaults to being in the user's home directory."],
      :vardir => [Puppet.run_mode.var_dir, "Where Puppet stores dynamic and growing data.  The default for this parameter is calculated specially, like `confdir`_."],
      :name => [Puppet.application_name.to_s, "The name of the application, if we are running as one.  The
        default is essentially $0 without the path or `.rb`."],
@@@ -598,11 -598,6 +598,11 @@@
        compression, but if it supports it, this setting might reduce performance on high-speed LANs."]
    )
  
 +  setdefaults(:inspect,
 +      :archive_files => [false, "During an inspect run, whether to archive files whose contents are audited to a file bucket."],
 +      :archive_file_server => ["$server", "During an inspect run, the file bucket server to archive files to if archive_files is set."]
 +  )
 +
    # Plugin information.
  
      setdefaults(

-- 
Puppet packaging for Debian