diff options
| author | Vivek Singh <vivek.singh@msystechnologies.com> | 2020-04-07 18:37:37 +0530 |
|---|---|---|
| committer | Vivek Singh <vivek.singh@msystechnologies.com> | 2020-04-07 18:42:04 +0530 |
| commit | 34caf4c788e206df8a883fe333b0d66922c34e04 (patch) | |
| tree | d0971987809474f5e01f9374aa25ba344bfe7639 | |
| parent | e091293eacc1d5944075ef5d220213cd2073799a (diff) | |
| download | chef-34caf4c788e206df8a883fe333b0d66922c34e04.tar.gz | |
Revert some
Signed-off-by: Vivek Singh <vivek.singh@msystechnologies.com>
| -rw-r--r-- | lib/chef/config.rb | 4 | ||||
| -rw-r--r-- | 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 46b590b899..bcda851033 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) |