summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/functions/require.rb
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-09-13 22:57:48 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-09-13 22:57:48 -0700
commit754ed19a8105a1be01c723a91abf9999ec6a8ab3 (patch)
tree8a3b59432ff56fbaf64d1cb6448e4e228f5359c0 /lib/puppet/parser/functions/require.rb
parent21afb51a1b84116b2a906a6959ae588f45135104 (diff)
parentefa834aaec596b0d5e7b314a53e6b258ce44728c (diff)
downloadpuppet-754ed19a8105a1be01c723a91abf9999ec6a8ab3.tar.gz
puppet-754ed19a8105a1be01c723a91abf9999ec6a8ab3.tar.xz
puppet-754ed19a8105a1be01c723a91abf9999ec6a8ab3.zip
Merge commit '2.6.1rc4'
Diffstat (limited to 'lib/puppet/parser/functions/require.rb')
-rw-r--r--lib/puppet/parser/functions/require.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/require.rb b/lib/puppet/parser/functions/require.rb
index f15046b91..64285307e 100644
--- a/lib/puppet/parser/functions/require.rb
+++ b/lib/puppet/parser/functions/require.rb
@@ -12,7 +12,7 @@ relationships between classes. This function is a superset of the
class depends on the required class.
Warning: using require in place of include can lead to unwanted dependency cycles.
-
+
For instance the following manifest, with 'require' instead of 'include' would produce a nasty dependence cycle, because notify imposes a before between File[/foo] and Service[foo]:
class myservice {