diff options
| author | Claire McQuin <mcquin@users.noreply.github.com> | 2014-08-14 14:04:59 -0700 |
|---|---|---|
| committer | Claire McQuin <mcquin@users.noreply.github.com> | 2014-08-14 14:04:59 -0700 |
| commit | 1f9abbee4878234e3c21f5e120fd9e1670238f94 (patch) | |
| tree | f9812bc7af25437862c9125130df4d3d19bf2a39 | |
| parent | 7d0ecc2c2d6c41ef3c546c079ac4773009f95e49 (diff) | |
| parent | 30d6c3c4ad0a317ab3467224fbfebb5c430d837d (diff) | |
| download | chef-1f9abbee4878234e3c21f5e120fd9e1670238f94.tar.gz | |
Merge pull request #1820 from opscode/mcquin/Issues-1446
Remove recipe DSL from base provider.
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | lib/chef/mixin/windows_architecture_helper.rb | 1 | ||||
| -rw-r--r-- | lib/chef/provider.rb | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e608f9075..8239d547ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,8 @@ * Enable Travis to run Test Kitchen with Kitchen EC2. * End-to-end tests for Ubuntu 12.04 * Only run end-to-end tests when secure environment variables are present. +* Remove recipe DSL from base provisioner (Issue 1446). + * [**Phil Dibowitz**](https://github.com/jaymzh): 'group' provider on OSX properly uses 'dscl' to determine existing groups diff --git a/lib/chef/mixin/windows_architecture_helper.rb b/lib/chef/mixin/windows_architecture_helper.rb index edcd596341..ff118c1d3d 100644 --- a/lib/chef/mixin/windows_architecture_helper.rb +++ b/lib/chef/mixin/windows_architecture_helper.rb @@ -18,6 +18,7 @@ require 'chef/exceptions' +require 'chef/platform/query_helpers' require 'win32/api' if Chef::Platform.windows? require 'chef/win32/api/process' if Chef::Platform.windows? require 'chef/win32/api/error' if Chef::Platform.windows? diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb index db7629dbcb..bdfe826944 100644 --- a/lib/chef/provider.rb +++ b/lib/chef/provider.rb @@ -19,14 +19,12 @@ require 'chef/mixin/from_file' require 'chef/mixin/convert_to_class_name' -require 'chef/dsl/recipe' require 'chef/mixin/enforce_ownership_and_permissions' require 'chef/mixin/why_run' require 'chef/mixin/shell_out' class Chef class Provider - include Chef::DSL::Recipe include Chef::Mixin::WhyRun include Chef::Mixin::ShellOut |