summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-02-28 19:02:43 -0800
committerGitHub <noreply@github.com>2020-02-28 19:02:43 -0800
commit94a1e5a987f9d23e4196f476975bbb235153939a (patch)
tree19f29d857171f4f6a68013ec0a42f914497d434b
parent7fa565737fb3cc984ad686266bbe3fec30312510 (diff)
parent9f2eeec7f06d869ffda28d4ebc37f64520138562 (diff)
downloadchef-94a1e5a987f9d23e4196f476975bbb235153939a.tar.gz
Merge pull request #9423 from chef/mixin_shell_out
Don't require/include Mixin Shellout in freebsd_package and openbsd_package
-rw-r--r--lib/chef/resource/freebsd_package.rb3
-rw-r--r--lib/chef/resource/openbsd_package.rb3
2 files changed, 0 insertions, 6 deletions
diff --git a/lib/chef/resource/freebsd_package.rb b/lib/chef/resource/freebsd_package.rb
index 3fc291633f..224896c8c0 100644
--- a/lib/chef/resource/freebsd_package.rb
+++ b/lib/chef/resource/freebsd_package.rb
@@ -21,13 +21,10 @@
require_relative "package"
require_relative "../provider/package/freebsd/port"
require_relative "../provider/package/freebsd/pkgng"
-require_relative "../mixin/shell_out"
class Chef
class Resource
class FreebsdPackage < Chef::Resource::Package
- include Chef::Mixin::ShellOut
-
unified_mode true
resource_name :freebsd_package
provides :package, platform: "freebsd"
diff --git a/lib/chef/resource/openbsd_package.rb b/lib/chef/resource/openbsd_package.rb
index b1321970b9..7e0d61e43f 100644
--- a/lib/chef/resource/openbsd_package.rb
+++ b/lib/chef/resource/openbsd_package.rb
@@ -21,13 +21,10 @@
require_relative "package"
require_relative "../provider/package/openbsd"
-require_relative "../mixin/shell_out"
class Chef
class Resource
class OpenbsdPackage < Chef::Resource::Package
- include Chef::Mixin::ShellOut
-
resource_name :openbsd_package
provides :package, os: "openbsd"