summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2014-09-03 07:06:32 -0700
committerJohn Keiser <john@johnkeiser.com>2015-01-08 21:06:47 -0800
commit426c8401353fa725ac1752509e3e726df6180efa (patch)
tree0af52552471b64a515cd6626713f9e6995aea359
parent2a71bd0c71d8ccbe28369f28e3d6c5ced78dbe4b (diff)
downloadchef-jk/local-mode-default.tar.gz
Get rid of commented-out stuffjk/local-mode-default
-rw-r--r--lib/chef/application.rb3
-rw-r--r--spec/unit/client_spec.rb16
2 files changed, 0 insertions, 19 deletions
diff --git a/lib/chef/application.rb b/lib/chef/application.rb
index b71dcc7392..f4cab2bad9 100644
--- a/lib/chef/application.rb
+++ b/lib/chef/application.rb
@@ -104,9 +104,6 @@ class Chef
end
end
- def load_single_config_file(file)
- end
-
# Initialize and configure the logger.
# === Loggers and Formatters
# In Chef 10.x and previous, the Logger was the primary/only way that Chef
diff --git a/spec/unit/client_spec.rb b/spec/unit/client_spec.rb
index a7ad67b7f5..1c72668ff8 100644
--- a/spec/unit/client_spec.rb
+++ b/spec/unit/client_spec.rb
@@ -99,22 +99,6 @@ describe Chef::Client do
end
end
- # def load_config_file
- # Chef::Config.config_file_jail = config[:config_file_jail] if config[:config_file_jail]
- # if !config.has_key?(:config_file)
- # if config[:local_mode]
- # require 'chef/knife'
- # config[:config_file] = Chef::Knife.locate_config_file
- # else
- # config[:config_file] = Chef::Config.platform_specific_path("/etc/chef/client.rb")
- # if Chef::ConfigFetcher.new(config[:config_file], Chef::Config[:config_file_jail]).config_missing?
- # require 'chef/knife'
- # config[:config_file] = Chef::Knife.locate_config_file
- # end
- # end
- # end
-
-
describe "configuring output formatters" do
context "when no formatter has been configured" do