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

[Jesse Wolfe]

The following commit has been merged in the upstream branch:
commit f34141477244564f31edde503a19b9fb898d986f
Merge: 443eba9b7a85cffa6b8513a32a620c80917be768 e58f5dc724c060d08e0ec4abdab6908442bcc0bc
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Tue Feb 1 16:21:55 2011 -0800

    Merge remote branch 'james/tickets/2.6.x/5742' into 2.6.next

diff --combined lib/puppet/util/command_line/puppetd
index 7d78ce9,f26131f..71b2842
--- a/lib/puppet/util/command_line/puppetd
+++ b/lib/puppet/util/command_line/puppetd
@@@ -11,7 -11,7 +11,7 @@@
  #
  #   puppet agent  [-D|--daemonize|--no-daemonize] [-d|--debug]
  #       [--detailed-exitcodes] [--disable] [--enable]
- #       [-h|--help] [--fqdn <host name>] [-l|--logdest syslog|<file>|console]
+ #       [-h|--help] [--certname <host name>] [-l|--logdest syslog|<file>|console]
  #       [-o|--onetime] [--serve <handler>] [-t|--test] [--noop]
  #       [--digest <digest>] [--fingerprint] [-V|--version]
  #       [-v|--verbose] [-w|--waitforcert <seconds>]
@@@ -113,10 -113,11 +113,11 @@@
  #
  #   +puppet agent+ exits after executing this.
  #
- # fqdn::
- #   Set the fully-qualified domain name of the client.  This is only used for
- #   certificate purposes, but can be used to override the discovered hostname.
- #   If you need to use this flag, it is generally an indication of a setup problem.
+ # certname::
+ #   Set the certname (unique ID) of the client. The master reads this unique
+ #   identifying string, which is usually set to the node's fully-qualified domain
+ #   name, to determine which configurations the node will receive. Use this option
+ #   to debug setup problems or implement unusual node identification schemes.
  #
  # help::
  #   Print this help message
@@@ -150,8 -151,7 +151,8 @@@
  #
  # test::
  #   Enable the most common options used for testing.  These are +onetime+,
 -#   +verbose+, +ignorecache, +no-daemonize+, and +no-usecacheonfailure+.
 +#   +verbose+, +ignorecache, +no-daemonize+, +no-usecacheonfailure+,
 +#   +detailed-exit-codes+, +no-splay+, and +show_diff+.
  #
  # noop::
  #   Use +noop+ mode where the daemon runs in a no-op or dry-run mode.  This is useful

-- 
Puppet packaging for Debian