diff --git a/Gemfile b/Gemfile index 63be91bc4..9018dc64f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,10 @@ source :gemcutter # Gems required for the lib to even run -gem "virtualbox", "~> 0.6.1" +gem "virtualbox", :git => "git://github.com/mitchellh/virtualbox.git" gem "net-ssh", ">= 2.0.19" gem "net-scp", ">= 1.0.2" -gem "json_pure", ">= 1.2.0" +gem "json", ">= 1.2.4" gem "archive-tar-minitar", "= 0.5.2" gem "mario", "~> 0.0.6" diff --git a/lib/vagrant/config.rb b/lib/vagrant/config.rb index 78e8bccfe..ab087e436 100644 --- a/lib/vagrant/config.rb +++ b/lib/vagrant/config.rb @@ -45,8 +45,8 @@ module Vagrant send(key) end - def to_json - instance_variables_hash.to_json + def to_json(*a) + instance_variables_hash.to_json(*a) end def instance_variables_hash diff --git a/lib/vagrant/provisioners/chef.rb b/lib/vagrant/provisioners/chef.rb index 35ba58d43..b6d27e309 100644 --- a/lib/vagrant/provisioners/chef.rb +++ b/lib/vagrant/provisioners/chef.rb @@ -59,12 +59,12 @@ module Vagrant run_list << name end - def to_json + def to_json(*a) # Overridden so that the 'json' key could be removed, since its just # merged into the config anyways data = instance_variables_hash data.delete(:json) - data.to_json + data.to_json(*a) end end