summaryrefslogtreecommitdiff
path: root/lib/ohai/system.rb
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-01-08 15:29:51 -0800
committerTim Smith <tsmith@chef.io>2017-01-08 15:46:25 -0800
commit3bdc1e2f3d0591eba391eb61a1f11798318ff47e (patch)
tree9112b713a819ee67ecad54dca1372456d9dec210 /lib/ohai/system.rb
parent60c7fd2a22cc95a8e52e9c0579ed7d49c531635a (diff)
downloadohai-3bdc1e2f3d0591eba391eb61a1f11798318ff47e.tar.gz
Remove deprecated config logic
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'lib/ohai/system.rb')
-rw-r--r--lib/ohai/system.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ohai/system.rb b/lib/ohai/system.rb
index c55383ca..7dd5ac8f 100644
--- a/lib/ohai/system.rb
+++ b/lib/ohai/system.rb
@@ -208,7 +208,6 @@ module Ohai
private
def configure_ohai
- Ohai::Config.merge_deprecated_config
Ohai.config.merge!(@config)
if Ohai.config[:directory] &&