summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/merge.rb
diff options
context:
space:
mode:
authorPaula McMaw <paula@puppet.com>2017-09-26 10:20:16 +0100
committerGitHub <noreply@github.com>2017-09-26 10:20:16 +0100
commit2b2b3870ec1737dc78ec402c2dccbb7b65a2ef8f (patch)
tree7d1c09d95d0d652e55cd9fdfbd2f627211883274 /lib/puppet/parser/functions/merge.rb
parent1ff99561b264febbb71b032b740fd28c4578d878 (diff)
parent51c9dc52cf68fcb128c5324d3642620100a44d27 (diff)
Merge pull request #811 from kofrezo/master
Allow root as valid UNIX path
Diffstat (limited to 'lib/puppet/parser/functions/merge.rb')
0 files changed, 0 insertions, 0 deletions