summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/functions/require.rb
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-09-13 23:00:35 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-09-13 23:00:35 -0700
commit9e72ccd8ff087d0cf4a1396401e3843311b4e6d4 (patch)
tree19f55c6cb37bfd9bc39f0bf9060643ac61005415 /lib/puppet/parser/functions/require.rb
parent1d93c4dd86181eb2663dd8df2e84719c2e1ffcdf (diff)
parentefa834aaec596b0d5e7b314a53e6b258ce44728c (diff)
downloadpuppet-9e72ccd8ff087d0cf4a1396401e3843311b4e6d4.tar.gz
puppet-9e72ccd8ff087d0cf4a1396401e3843311b4e6d4.tar.xz
puppet-9e72ccd8ff087d0cf4a1396401e3843311b4e6d4.zip
Merge commit '2.6.1rc4' into next
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 {