Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-15 01:17:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

bugfix: deep merge mysql conf parameters

Browse source 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
This commit is contained in:
Dominik Richter 2015-09-10 11:26:04 +02:00
parent 4852842bf6
commit 165c08799f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/resources/mysql_conf.rb
View file

@ -4,6 +4,7 @@
require 'utils/parseconfig' require 'utils/parseconfig'
require 'utils/find_files' require 'utils/find_files'
require 'utils/hash'
require 'resources/mysql' require 'resources/mysql'
class MysqlConfEntry class MysqlConfEntry
@ -75,7 +76,7 @@ class MysqlConf < Vulcano.resource(1)
@content += raw_conf @content += raw_conf
params = ParseConfig.new(raw_conf).params params = ParseConfig.new(raw_conf).params
@params.merge!(params) @params = @params.deep_merge(params)
to_read = to_read.drop(1) to_read = to_read.drop(1)
# see if there is more stuff to include # see if there is more stuff to include