summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-02-28 13:32:38 -0800
committerGitHub <noreply@github.com>2018-02-28 13:32:38 -0800
commit6a073302fe3167b54b5a8d239ea15a6dfe1b756b (patch)
tree064fa539c0b8231888cac74a176e18c9cca2d846
parentac19cbfb5fb05189e0edc400bc1acd9a7364b4d8 (diff)
parenta0c8791fe970954ba089194a7dc8e875bc9a66fa (diff)
downloadchef-6a073302fe3167b54b5a8d239ea15a6dfe1b756b.tar.gz
Merge pull request #6919 from chef/lcg/fix-chefstyle
fix for master of chefstyle
-rw-r--r--lib/chef/knife/environment_compare.rb2
-rw-r--r--lib/chef/knife/list.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/knife/environment_compare.rb b/lib/chef/knife/environment_compare.rb
index 2e70783d3f..9131f06068 100644
--- a/lib/chef/knife/environment_compare.rb
+++ b/lib/chef/knife/environment_compare.rb
@@ -81,7 +81,7 @@ class Chef
def constraint_list(environments)
constraints = {}
- environments.each do |env, url|
+ environments.each do |env, url| # rubocop:disable Performance/HashEachMethods
# Because you cannot modify the default environment I filter it out here.
unless env == "_default"
envdata = Chef::Environment.load(env)
diff --git a/lib/chef/knife/list.rb b/lib/chef/knife/list.rb
index 6f314eb86d..e1a50b9360 100644
--- a/lib/chef/knife/list.rb
+++ b/lib/chef/knife/list.rb
@@ -69,7 +69,7 @@ class Chef
# Flatten out directory results if necessary
if config[:flat]
- dir_results.each do |result, children|
+ dir_results.each do |result, children| # rubocop:disable Performance/HashEachMethods
results += children
end
dir_results = []