diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-03-16 11:19:10 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-03-16 11:19:10 -0700 |
| commit | de8fea8ac8b25f45ffb07a2ef63a6da0cbaf0c41 (patch) | |
| tree | f520b1400b4d35e63a0b1977b508d51d9422a88a /lib/puppet/module.rb | |
| parent | 86c60354da1d5a2a54baf6dbd92677a12701423d (diff) | |
| parent | c60c6cacaca6b8e34c29835f9e5749fc380b8e0b (diff) | |
| download | puppet-de8fea8ac8b25f45ffb07a2ef63a6da0cbaf0c41.tar.gz puppet-de8fea8ac8b25f45ffb07a2ef63a6da0cbaf0c41.tar.xz puppet-de8fea8ac8b25f45ffb07a2ef63a6da0cbaf0c41.zip | |
Merge branch '2.6.next' into 2.6.x
* 2.6.next: (102 commits)
(#5073) Download plugins even if you're filtering on tags
Fix #5610: Prevent unnecessary RAL lookups
Revert "Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2.6.next"
(#6723) Fix withenv environment restoration bug
(#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecord
Remove extra trailing whitespace from lib/puppet/resource.rb
(#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs
(#6707) Fix typo in rest_authconfig.rb
(#6689) Make inventory_active_record terminus search quickly
(#5392) Give a better error when realizing a non-existant resource
(#2645) Adding a less-stubby test to verify the "system" attribute's behavior
maint: Remove serialization of InventoryFact values
maint: Rename InventoryHost to InventoryNode
Fixed #2645 - Added support for creating system users
maint: Remove spec run noise
maint:Refactor of mount provider integration tests
(#6338) Support searching on metadata in InventoryActiveRecord terminus
(#6338) Implement search for InventoryActiveRecord facts terminus
(#6338) Add an InventoryActiveRecord terminus for Facts
Added integration tests for the mount provider
...
Diffstat (limited to 'lib/puppet/module.rb')
| -rw-r--r-- | lib/puppet/module.rb | 2 |
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") |