summaryrefslogtreecommitdiff
path: root/lib/chef/util
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-02-12 09:32:14 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-02-12 09:32:14 -0800
commit03eadde04eb219bfa8abe52d312261a5142e7266 (patch)
treeb0864a3e70741f5a15f0337824f25b69fc319c07 /lib/chef/util
parent1e324f073455db7596f37da6bf21b2f6521529ce (diff)
downloadchef-03eadde04eb219bfa8abe52d312261a5142e7266.tar.gz
pull rubocop 0.37.2 into chefstyle
this is from the same ruleset that we had, but the new code catches more conditions.
Diffstat (limited to 'lib/chef/util')
-rw-r--r--lib/chef/util/dsc/configuration_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/util/dsc/configuration_generator.rb b/lib/chef/util/dsc/configuration_generator.rb
index af9a71b246..739a463ad5 100644
--- a/lib/chef/util/dsc/configuration_generator.rb
+++ b/lib/chef/util/dsc/configuration_generator.rb
@@ -68,7 +68,7 @@ class Chef::Util::DSC
end
def get_merged_configuration_flags!(configuration_flags, configuration_name)
- merged_configuration_flags = { :outputpath => configuration_document_directory(configuration_name) }
+ merged_configuration_flags = { :outputpath => configuration_document_directory(configuration_name) }
if configuration_flags
configuration_flags.map do |switch, value|
if merged_configuration_flags.key?(switch.to_s.downcase.to_sym)