Fixed issue with JSON 1.4.3 [closes GH-62]
This commit is contained in:
parent
d7e0172e2d
commit
7198471af1
4
Gemfile
4
Gemfile
|
@ -1,10 +1,10 @@
|
|||
source :gemcutter
|
||||
|
||||
# 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-scp", ">= 1.0.2"
|
||||
gem "json", ">= 1.2.0"
|
||||
gem "json", ">= 1.2.4"
|
||||
gem "archive-tar-minitar", "= 0.5.2"
|
||||
gem "mario", "~> 0.0.6"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue