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

Fixed issue with JSON 1.4.3 [closes GH-62]

This commit is contained in:
Mitchell Hashimoto 2010-05-13 13:00:00 -07:00
parent d7e0172e2d
commit 7198471af1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -1,10 +1,10 @@
source :gemcutter source :gemcutter
# Gems required for the lib to even run # Gems required for the lib to even run
gem "virtualbox", "~> 0.6.2" gem "virtualbox", :git => "git://github.com/mitchellh/virtualbox.git"
gem "net-ssh", ">= 2.0.19" gem "net-ssh", ">= 2.0.19"
gem "net-scp", ">= 1.0.2" gem "net-scp", ">= 1.0.2"
gem "json", ">= 1.2.0" gem "json", ">= 1.2.4"
gem "archive-tar-minitar", "= 0.5.2" gem "archive-tar-minitar", "= 0.5.2"
gem "mario", "~> 0.0.6" gem "mario", "~> 0.0.6"

4
lib/vagrant/config.rb
View File

@ -45,8 +45,8 @@ module Vagrant
send(key) send(key)
end end
def to_json def to_json(*a)
instance_variables_hash.to_json instance_variables_hash.to_json(*a)
end end
def instance_variables_hash def instance_variables_hash

4
lib/vagrant/provisioners/chef.rb
View File

@ -59,12 +59,12 @@ module Vagrant
run_list << name run_list << name
end end
def to_json def to_json(*a)
# Overridden so that the 'json' key could be removed, since its just # Overridden so that the 'json' key could be removed, since its just
# merged into the config anyways # merged into the config anyways
data = instance_variables_hash data = instance_variables_hash
data.delete(:json) data.delete(:json)
data.to_json data.to_json(*a)
end end
end end