diff options
| author | Jesse Campbell <hikeit@gmail.com> | 2013-03-01 12:25:01 -0500 |
|---|---|---|
| committer | Jesse Campbell <hikeit@gmail.com> | 2013-03-01 12:25:01 -0500 |
| commit | a2faf73b16726fef02dd644437105d05c7700bf1 (patch) | |
| tree | 3eff391b63dd9e9c496d34fff5f7be88ce630b49 /lib/chef/providers.rb | |
| parent | 2139a6888756fdcedce559c9e38a8ea76a5f7b54 (diff) | |
| parent | 77f911b99e68bf1ae068ce79f70f670f52943b2e (diff) | |
| download | chef-a2faf73b16726fef02dd644437105d05c7700bf1.tar.gz | |
Merge branch 'master' into rest_client
Conflicts:
lib/chef/provider/remote_file.rb
lib/chef/provider/remote_file/ftp.rb
lib/chef/providers.rb
lib/chef/resource/remote_file.rb
spec/unit/provider/remote_file/ftp_spec.rb
spec/unit/provider/remote_file_spec.rb
spec/unit/resource/remote_file_spec.rb
Diffstat (limited to 'lib/chef/providers.rb')
| -rw-r--r-- | lib/chef/providers.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/chef/providers.rb b/lib/chef/providers.rb index 0c7aed61b8..f4b3175546 100644 --- a/lib/chef/providers.rb +++ b/lib/chef/providers.rb @@ -16,6 +16,7 @@ # limitations under the License. # +require 'chef/provider/batch' require 'chef/provider/breakpoint' require 'chef/provider/cookbook_file' require 'chef/provider/cron' @@ -36,6 +37,7 @@ require 'chef/provider/ohai' require 'chef/provider/mdadm' require 'chef/provider/mount' require 'chef/provider/package' +require 'chef/provider/powershell' require 'chef/provider/remote_directory' require 'chef/provider/remote_file' require 'chef/provider/route' |