mirror of
https://github.com/OpenNebula/one.git
synced 2024-12-24 21:34:01 +03:00
fix a bug setting quota configuration
This commit is contained in:
parent
2f98aad264
commit
d1054d465e
@ -91,7 +91,15 @@ class Quota
|
||||
def initialize
|
||||
conf = YAML.load_file(CONF_FILE)
|
||||
@conf=CONF.merge(conf) {|key,h1,h2|
|
||||
h1.merge(h2) if h1.instance_of?(Hash) && h2.instance_of?(Hash)
|
||||
if h1.instance_of?(Hash) && h2.instance_of?(Hash)
|
||||
h1.merge(h2)
|
||||
else
|
||||
if h2
|
||||
h2
|
||||
else
|
||||
h1
|
||||
end
|
||||
end
|
||||
}
|
||||
|
||||
@client = OpenNebula::Client.new
|
||||
|
Loading…
Reference in New Issue
Block a user