diff options
| author | Bryan McLellan <btm@opscode.com> | 2013-03-01 15:12:43 -0800 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2013-03-01 15:27:45 -0800 |
| commit | f6027a5a837466dc7d416a1a7980dd2681b1f095 (patch) | |
| tree | 1b7bcc58d9952014c8a7bb79bef9e0725791081a /lib/chef/providers.rb | |
| parent | 4346211bd4f29745c0dfd467eda22b03a3746a6d (diff) | |
| download | chef-f6027a5a837466dc7d416a1a7980dd2681b1f095.tar.gz | |
Revert "Merge branch 'CHEF-1031'"
This reverts commit a82935b4a8e1e8174d02e83259f07ea9926dd007, reversing
changes made to 464087c7a6da4ed51237cbb6ff39e45feeae0ecd.
Conflicts:
lib/chef/provider/remote_file/ftp.rb
Diffstat (limited to 'lib/chef/providers.rb')
| -rw-r--r-- | lib/chef/providers.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/chef/providers.rb b/lib/chef/providers.rb index 3a40c542ec..ae95632eaa 100644 --- a/lib/chef/providers.rb +++ b/lib/chef/providers.rb @@ -101,7 +101,5 @@ require 'chef/provider/mount/windows' require 'chef/provider/deploy/revision' require 'chef/provider/deploy/timestamped' -require 'chef/provider/remote_file/ftp' - require "chef/provider/lwrp_base" require 'chef/provider/registry_key' |