Merge branch 'master' of github.com:hashicorp/terraform

This commit is contained in:
JT 2014-07-27 21:47:15 -07:00
commit 6dd0ffe4e4
1 changed files with 2 additions and 2 deletions

View File

@ -21,8 +21,8 @@ if ENV["TERRAFORM_VERSION"]
$terraform_files[os] << filename $terraform_files[os] << filename
end end
$terraform_os = ["darwin", "linux", "windows"] & $consul_files.keys $terraform_os = ["darwin", "linux", "windows"] & $terraform_files.keys
$terraform_os += $consul_files.keys $terraform_os += $terraform_files.keys
$terraform_os.uniq! $terraform_os.uniq!
$terraform_files.each do |key, value| $terraform_files.each do |key, value|