summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/merge.rb
diff options
context:
space:
mode:
authorJosh Cooper <josh+github@puppetlabs.com>2012-03-06 15:53:08 -0800
committerJosh Cooper <josh+github@puppetlabs.com>2012-03-06 15:53:08 -0800
commit32bad79d88e4464cb91101e4671874c11f3e5bf2 (patch)
treedc951630d4c7c4b9f0b49793ebed3b782c903b0c /lib/puppet/parser/functions/merge.rb
parentc0ac470e764841b0de88dbabade342dc2c1b193e (diff)
parentafd22ddc99af306aa476be7eaf9f02ada941c97b (diff)
downloadpuppet-stdlib-32bad79d88e4464cb91101e4671874c11f3e5bf2.tar.gz
puppet-stdlib-32bad79d88e4464cb91101e4671874c11f3e5bf2.tar.bz2
Merge pull request #45 from jeffmccune/ticket/2.3.x/12357_disable_root_home_fact_on_windows
(#12357) Fix root_home fact on Windows
Diffstat (limited to 'lib/puppet/parser/functions/merge.rb')
0 files changed, 0 insertions, 0 deletions