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

Update CHANGELOG

This commit is contained in:
Mitchell Hashimoto 2012-01-11 09:57:07 -08:00
parent fc7111734b
commit 43a9f0928a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -27,6 +27,8 @@
logging is silent. logging is silent.
- `system` renamed to `guest` throughout the source. Any `config.vm.system` - `system` renamed to `guest` throughout the source. Any `config.vm.system`
configurations must be changed to `config.vm.guest` configurations must be changed to `config.vm.guest`
- Puppet provisioner no longer defaults manifest to "box.pp." Instead, it
is now "default.pp"
- All Vagrant commands that take a VM name in a Multi-VM environment - All Vagrant commands that take a VM name in a Multi-VM environment
can now be given a regular expression. If the name starts and ends with a "/" can now be given a regular expression. If the name starts and ends with a "/"
then it is assumed to be a regular expression. [GH-573] then it is assumed to be a regular expression. [GH-573]

2
lib/vagrant/provisioners/puppet.rb
View File

@ -82,7 +82,7 @@ module Vagrant
# Calculate the paths we're going to use based on the environment # Calculate the paths we're going to use based on the environment
@expanded_manifests_path = config.expanded_manifests_path(env[:root_path]) @expanded_manifests_path = config.expanded_manifests_path(env[:root_path])
@expanded_module_paths = config.expanded_module_paths(env[:root_path]) @expanded_module_paths = config.expanded_module_paths(env[:root_path])
@manifest_file = @expanded_manifests_path.join(config.manifest_file) @manifest_file = File.join(manifests_guest_path, config.manifest_file)
set_module_paths set_module_paths
share_manifests share_manifests