Skip to content
This repository has been archived by the owner on Jan 10, 2023. It is now read-only.

Commit

Permalink
Fix rubocop warning
Browse files Browse the repository at this point in the history
  • Loading branch information
linc01n committed May 14, 2016
1 parent f2d3a1c commit 96e708b
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion libraries/stash.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ def merge_stash_settings
@settings_from_data_bag ||= settings_from_data_bag
settings = Chef::Mixin::DeepMerge.deep_merge(
@settings_from_data_bag,
node['stash'].to_hash)
node['stash'].to_hash
)

settings['database']['port'] ||=
case settings['database']['type']
Expand Down

0 comments on commit 96e708b

Please sign in to comment.