Skip to content

Commit

Permalink
Typo in config
Browse files Browse the repository at this point in the history
  • Loading branch information
julienvey committed Feb 25, 2015
1 parent 6894a61 commit 6e88244
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion source/lib/vagrant-openstack-provider/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def merge(other)
# Don't set the value if it is the unset value, either.
value = obj.instance_variable_get(key)

if [:@networks, :@volumes, :@rsync_includes, :@ignore_files, :@floating_ip_pool, :@stacks].include? key
if [:@networks, :@volumes, :@rsync_includes, :@rsync_ignore_files, :@floating_ip_pool, :@stacks].include? key
result.instance_variable_set(key, value) unless value.empty?
elsif [:@http].include? key
result.instance_variable_set(key, instance_variable_get(key).merge(other.instance_variable_get(key))) if value != UNSET_VALUE
Expand Down

0 comments on commit 6e88244

Please sign in to comment.