haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

provisioners/puppet: fix config merging [GH-5958]

This commit is contained in:
Mitchell Hashimoto 2015-07-15 10:59:34 -07:00
parent 3476491881
commit ce5a30b264
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@ BUG FIXES:
- providers/virtulabox: remove UNC path conversion on Windows since it
caused mounting regressions [GH-5933]
- provisioners/puppet: Windows Puppet 4 paths work correctly [GH-5967]
- provisioners/puppet: Fix config merging errors [GH-5958]
- provisioners/salt: fix "dummy config" error on bootstrap [GH-5936]
## 1.7.3 (July 10, 2015)

2
plugins/provisioners/puppet/config/puppet.rb
View File

@ -52,8 +52,6 @@ module VagrantPlugins
def merge(other)
super.tap do |result|
result.facter = @facter.merge(other.facter)
result.environment_path = @facter.merge(other.environment_path)
result.environment = @facter.merge(other.environment)
end
end