summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2011-03-08 17:22:06 -0800
committerMatt Robinson <matt@puppetlabs.com>2011-03-08 17:22:06 -0800
commiteae17c3cba159d895e5ec2e87e4abe8c125a9562 (patch)
tree3b3142c26154374e3ffefa2fe875833367c4da5b /lib
parente8763415627cf41cefece00bf4dbc48e9be81d1d (diff)
parenta3f2357215b15f318500d6637f393dad0d4a4181 (diff)
downloadpuppet-eae17c3cba159d895e5ec2e87e4abe8c125a9562.tar.gz
puppet-eae17c3cba159d895e5ec2e87e4abe8c125a9562.tar.xz
puppet-eae17c3cba159d895e5ec2e87e4abe8c125a9562.zip
Merge branch 'ticket/2.6.next/maint-cleanup_spec_output' into 2.6.next
* ticket/2.6.next/maint-cleanup_spec_output: maint: Remove spec run noise
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/module.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/module.rb b/lib/puppet/module.rb
index 8da19c2ce..43266b2b5 100644
--- a/lib/puppet/module.rb
+++ b/lib/puppet/module.rb
@@ -191,7 +191,7 @@ class Puppet::Module
def backward_compatible_plugins_dir
if dir = File.join(path, "plugins") and FileTest.exist?(dir)
- warning "using the deprecated 'plugins' directory for ruby extensions; please move to 'lib'"
+ Puppet.warning "using the deprecated 'plugins' directory for ruby extensions; please move to 'lib'"
return dir
else
return File.join(path, "lib")