summaryrefslogtreecommitdiffstats
path: root/lib/puppet/type/file.rb
diff options
context:
space:
mode:
authorMax Martin <max@puppetlabs.com>2011-04-07 12:21:42 -0700
committerMax Martin <max@puppetlabs.com>2011-04-07 12:21:42 -0700
commit20bff91c8b8e450d913deeb1750a00a14f1b1061 (patch)
tree38191b4766c8e2354c27c0868c12e0e254b4389f /lib/puppet/type/file.rb
parente17cc651a9625576aa79af428bbaec702e216ac8 (diff)
parentda4457be4dedaed5368bacf81a08f0429e21cd45 (diff)
downloadpuppet-20bff91c8b8e450d913deeb1750a00a14f1b1061.tar.gz
puppet-20bff91c8b8e450d913deeb1750a00a14f1b1061.tar.xz
puppet-20bff91c8b8e450d913deeb1750a00a14f1b1061.zip
Merge branch '2.6.x' into next
* 2.6.x: (maint) Indentation fixes (#6490) Add plugin initialization callback system to core Fix #4339 - Locally save the last report to $lastrunreport Fix #4339 - Save a last run report summary to $statedir/last_run_summary.yaml Fixed #3127 - removed legacy debug code Fixed #3127 - Fixed gem selection regex (#5437) Invalidate cached TypeCollection when there was an error parsing (#6937) Adjust formatting of recurse's desc (#6937) Document the recurse parameter of File type. (#6893) Document the cron type in the case of specials. (#5670) Don't trigger refresh from a failed resource Fixed #6554 - Missing $haveftool if/else conditional in install.rb breaking Ruby 1.9 Conflicts (Manually resolved): lib/puppet/application/agent.rb lib/puppet/application/apply.rb lib/puppet/configurer.rb lib/puppet/resource/type_collection.rb lib/puppet/type/file.rb spec/integration/configurer_spec.rb spec/unit/application/agent_spec.rb spec/unit/application/apply_spec.rb spec/unit/configurer_spec.rb spec/unit/indirector/report/yaml_spec.rb spec/unit/resource/type_collection_spec.rb Paired-with: Nick Lewis
Diffstat (limited to 'lib/puppet/type/file.rb')
-rw-r--r--lib/puppet/type/file.rb19
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb
index 5632d41f1..715836b22 100644
--- a/lib/puppet/type/file.rb
+++ b/lib/puppet/type/file.rb
@@ -123,15 +123,16 @@ Puppet::Type.newtype(:file) do
newparam(:recurse) do
desc "Whether and how deeply to do recursive
management. Options are:
- inf,true => Regular style recursion on both remote and local
- directory structure.
- remote => Descends recursively into the remote directory
- but not the local directory. Allows copying of
- a few files into a directory containing many
- unmanaged files without scanning all the local files.
- false => Default of no-recursion.
- [0-9]+ => Both, but limit recursion. Warning: this syntax
- is deprecated and has moved to recurselimit.
+
+ * `inf,true` --- Regular style recursion on both remote and local
+ directory structure.
+ * `remote` --- Descends recursively into the remote directory
+ but not the local directory. Allows copying of
+ a few files into a directory containing many
+ unmanaged files without scanning all the local files.
+ * `false` --- Default of no recursion.
+ * `[0-9]+` --- Same as true, but limit recursion. Warning: this syntax
+ has been deprecated in favor of the `recurselimit` attribute.
"
newvalues(:true, :false, :inf, :remote, /^[0-9]+$/)