diff options
author | Jesse Wolfe <jes5199@gmail.com> | 2010-08-12 13:51:14 -0700 |
---|---|---|
committer | Jesse Wolfe <jes5199@gmail.com> | 2010-08-12 13:51:14 -0700 |
commit | 0f56c1b02d40f1f8552d933dd78b24745937b137 (patch) | |
tree | 3c6495838d1b876528cb4522de3484c44749140d /lib/puppet/parser/functions/require.rb | |
parent | b53e7d78e2e87571ae53170e9716b9ccd75da6e2 (diff) | |
parent | 0aa27b5cc5df818e3878601e83f83a20590e161a (diff) | |
download | puppet-0f56c1b02d40f1f8552d933dd78b24745937b137.tar.gz puppet-0f56c1b02d40f1f8552d933dd78b24745937b137.tar.xz puppet-0f56c1b02d40f1f8552d933dd78b24745937b137.zip |
Merge commit '2.6.1rc2' into next
Diffstat (limited to 'lib/puppet/parser/functions/require.rb')
-rw-r--r-- | lib/puppet/parser/functions/require.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/puppet/parser/functions/require.rb b/lib/puppet/parser/functions/require.rb index 3f98c9523..f15046b91 100644 --- a/lib/puppet/parser/functions/require.rb +++ b/lib/puppet/parser/functions/require.rb @@ -12,9 +12,8 @@ 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]:: + +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 { service { foo: ensure => running } |