Knockout prefix reproduction

examples/hiera/data/common.yaml

@@ -9,4 +9,6 @@ ntp::config::ntpservers:
 
 lookup_options:
  classes:
- merge: unique
+ merge:
+ strategy: deep
+ knockout_prefix: --

examples/hiera/data/dc1.yaml

@@ -3,4 +3,5 @@ ntp::config::ntpservers:
  - 'ntp1.dc1.example.com'
  - 'ntp2.dc1.example.com'
 classes:
+ - --ntp::config
  - users::dc1

examples/hiera/data/production.yaml

@@ -0,0 +1,2 @@
+---
+classes:

examples/hiera/hiera.yaml

@@ -6,10 +6,12 @@ defaults:
 
 hierarchy:
  - name: 'Per Location'
- path: "%{facts.location}.yaml"
+ path: 'dc1.yaml'
+ #%{facts.location}.yaml"
 
  - name: 'Per Environment'
- path: "%{facts.environment}.yaml"
+ path: 'production.yaml' 
+ # path: "%{facts.environment}.yaml"
 
  - name: 'Common Data'
  path: 'common.yaml'

lib/puppet/pops/merge_strategy.rb

@@ -373,7 +373,9 @@ def checked_merge(e1, e2)
  dm_options = { :preserve_unmergeables => false }
  options.each_pair { |k, v| dm_options[k.to_sym] = v unless k == 'strategy' }
  # e2 (the destination) is deep cloned to avoid that the passed in object mutates
- DeepMerge.deep_merge!(e1, deep_clone(e2), dm_options)
+ rval = DeepMerge.deep_merge!(e1, deep_clone(e2), dm_options)
+ puts "Merging #{e1.inspect} with #{e2.inspect} result #{rval.inspect}"
+ rval
  end
 
  def deep_clone(value)