summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-10-14 13:23:44 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2014-10-14 13:23:44 -0700
commit72f13fd58353b69fcf0f686a14cb52f8b29991a4 (patch)
tree6b0d6ad841fc44b08424527c59fcf3fefca7fff2
parentc62f97362b94aa13d2c7cbf77641c8c10a6e69dc (diff)
downloadchef-72f13fd58353b69fcf0f686a14cb52f8b29991a4.tar.gz
Revert "remove chef/shell_out dep"
This reverts commit c62f97362b94aa13d2c7cbf77641c8c10a6e69dc. derp.
-rw-r--r--lib/chef/mixin/shell_out.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/chef/mixin/shell_out.rb b/lib/chef/mixin/shell_out.rb
index 5b05e788db..82772b584a 100644
--- a/lib/chef/mixin/shell_out.rb
+++ b/lib/chef/mixin/shell_out.rb
@@ -15,6 +15,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# chef/shell_out has been deprecated in favor of mixlib/shellout
+# chef/shell_out is still required here to ensure backward compatibility
+require 'chef/shell_out'
+
require 'mixlib/shellout'
class Chef