From 9dd9510d4809f27d1a6d97927bea590159b3b651 Mon Sep 17 00:00:00 2001 From: Vivek Singh Date: Tue, 7 Apr 2020 18:37:37 +0530 Subject: Revert some Signed-off-by: Vivek Singh --- lib/chef/config.rb | 4 ++-- lib/chef/cookbook/cookbook_version_loader.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/chef/config.rb b/lib/chef/config.rb index 8a4b67ea57..6e120300a4 100644 --- a/lib/chef/config.rb +++ b/lib/chef/config.rb @@ -64,7 +64,7 @@ class Chef # Override the default values that were set by Ohai. # - # REMOVEME once these configurable are removed from the top level of Ohai. + # REMOVEME once these configurables are removed from the top level of Ohai. default :log_level, LOG_LEVEL default :log_location, LOG_LOCATION @@ -74,7 +74,7 @@ class Chef # chef-client and other tools (e.g., knife), we will mute the warnings here # by redefining the config_attr_writer to not warn for these options. # - # REMOVEME once the warnings for these configurable are removed from Ohai. + # REMOVEME once the warnings for these configurables are removed from Ohai. %i{log_level log_location}.each do |option| config_attr_writer option do |value| value diff --git a/lib/chef/cookbook/cookbook_version_loader.rb b/lib/chef/cookbook/cookbook_version_loader.rb index 79aa8d9708..626a5d423b 100644 --- a/lib/chef/cookbook/cookbook_version_loader.rb +++ b/lib/chef/cookbook/cookbook_version_loader.rb @@ -220,7 +220,7 @@ class Chef # Use Find.find because it: # (a) returns any children, recursively # (b) includes top_path as well - # (c) skips symlinks, which is backcompat (no judgment on whether it was *right*) + # (c) skips symlinks, which is backcompat (no judgement on whether it was *right*) Find.find(top_path) do |path| # Only add files, not directories next unless File.file?(path) -- cgit v1.2.1