diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-12-02 14:43:15 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-12-02 14:43:15 -0800 |
| commit | dac675c94e6ed1ee67a3081ba7379e000ee93c1c (patch) | |
| tree | d01241c30e679ebf8c7a6be0d907ed3eda523584 /man/man8/filebucket.8 | |
| parent | 022114d8e50b1adb785b38262251979a222e7972 (diff) | |
| parent | af6e08c0a59db951502d0cf8c0ca24f5001e92f1 (diff) | |
| download | puppet-dac675c94e6ed1ee67a3081ba7379e000ee93c1c.tar.gz puppet-dac675c94e6ed1ee67a3081ba7379e000ee93c1c.tar.xz puppet-dac675c94e6ed1ee67a3081ba7379e000ee93c1c.zip | |
Merge branch '2.6.x' into next
* 2.6.x:
(#5304) Use internal_name rather than real_name for maillist provider
Updated CHANGELOG and version for 2.6.4
Revert "(#5304) Use internal_name rather than real_name for maillist provider"
Disable remote ralsh by default
(#5424) Ship auth.conf as part of installing from source
(#5304) Use internal_name rather than real_name for maillist provider
Renamed Reductive to Puppet
Manually Resolved Conflicts:
lib/puppet/provider/maillist/mailman.rb
Diffstat (limited to 'man/man8/filebucket.8')
| -rw-r--r-- | man/man8/filebucket.8 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/man/man8/filebucket.8 b/man/man8/filebucket.8 index 60a6eb28e..59afc2ed3 100644 --- a/man/man8/filebucket.8 +++ b/man/man8/filebucket.8 @@ -102,4 +102,4 @@ server: The server to send the file to, instead of locally\. verbose: Print extra information\. . .P -version: Print version information\.puppet filebucket \-b /tmp/filebucket /my/fileLuke KaniesCopyright (c) 2005 Reductive Labs, LLC Licensed under the GNU Public License +version: Print version information\.puppet filebucket \-b /tmp/filebucket /my/fileLuke KaniesCopyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License |