diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-08-24 15:42:03 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-08-24 15:42:03 -0700 |
| commit | da4a2def42639817c4522fc0162bd691956998da (patch) | |
| tree | 3cb423a7d2a7a803a922b710c661d675d11bf131 /lib/puppet/provider | |
| parent | 0d51dc9be0bc1c785d749b8b352a1e43b1b6e9c6 (diff) | |
| parent | 630ec36089e2224fba99b76d76eaf904af13e4d6 (diff) | |
| download | puppet-da4a2def42639817c4522fc0162bd691956998da.tar.gz puppet-da4a2def42639817c4522fc0162bd691956998da.tar.xz puppet-da4a2def42639817c4522fc0162bd691956998da.zip | |
Merge branch '2.7.x'
Conflicts:
lib/puppet/feature/base.rb
lib/puppet/file_serving/configuration.rb
spec/unit/indirector/ssl_file_spec.rb
spec/unit/parser/functions/extlookup_spec.rb
spec/unit/resource/catalog_spec.rb
test/language/ast/variable.rb
Diffstat (limited to 'lib/puppet/provider')
| -rw-r--r-- | lib/puppet/provider/mount.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/provider/naginator.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/provider/package.rb | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/lib/puppet/provider/mount.rb b/lib/puppet/provider/mount.rb index 65296eed2..e2aba8076 100644 --- a/lib/puppet/provider/mount.rb +++ b/lib/puppet/provider/mount.rb @@ -1,6 +1,3 @@ -# Created by Luke Kanies on 2006-11-12. -# Copyright (c) 2006. All rights reserved. - require 'puppet' # A module just to store the mount/unmount methods. Individual providers diff --git a/lib/puppet/provider/naginator.rb b/lib/puppet/provider/naginator.rb index 17cc24086..c84f75c98 100644 --- a/lib/puppet/provider/naginator.rb +++ b/lib/puppet/provider/naginator.rb @@ -1,6 +1,3 @@ -# Created by Luke Kanies on 2007-11-27. -# Copyright (c) 2007. All rights reserved. - require 'puppet' require 'puppet/provider/parsedfile' require 'puppet/external/nagios' diff --git a/lib/puppet/provider/package.rb b/lib/puppet/provider/package.rb index 2f5f67547..f5bfa1216 100644 --- a/lib/puppet/provider/package.rb +++ b/lib/puppet/provider/package.rb @@ -1,6 +1,3 @@ -# Created by Luke A. Kanies on 2007-06-05. -# Copyright (c) 2007. All rights reserved. - class Puppet::Provider::Package < Puppet::Provider # Prefetch our package list, yo. def self.prefetch(packages) |