add template_context for load_yaml_merge, it is used by load_yaml. when template_context is nil, there is not impact for load_yaml_merge.

Signed-off-by: Wei Jihui weijihuiall@163.com --- lib/yaml.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/yaml.rb b/lib/yaml.rb index 9c9b8088..4290d594 100755 --- a/lib/yaml.rb +++ b/lib/yaml.rb @@ -52,13 +52,13 @@ def load_yaml_with_flock(file, timeout = nil) end end

-def load_yaml_merge(files) +def load_yaml_merge(files, template_context = nil) all = {} files.each do |file| next unless File.size? file

begin - yaml = load_yaml(file) + yaml = load_yaml(file, template_context) all.update(yaml) rescue StandardError => e warn "#{e.class.name}: #{e.message.split("\n").first}: #{file}"