Skip to content

Commit

Permalink
Merge pull request #313 from victorgp/master
Browse files Browse the repository at this point in the history
Keepalived config not merged since you are specifying the json in the puppet hash variable
  • Loading branch information
jamtur01 committed Apr 10, 2015
2 parents 8e69a0e + 0dbef7d commit 1c9faca
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions lib/puppet/provider/sensu_client_config/json.rb
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,7 @@ def keepalive
end

def keepalive=(value)
conf['client']['keepalive'] ||= {}
conf['client']['keepalive'].merge!(to_type(value))
conf['client']['keepalive'] = value
end

def safe_mode
Expand Down

0 comments on commit 1c9faca

Please sign in to comment.