shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

fix a bug setting quota configuration

Browse Source 
(cherry picked from commit d1054d465e463a1d99a46585a1bbfac8cfe4ef47)
This commit is contained in:
Javi Fontan 2011-12-01 18:03:16 +00:00
parent 9823b23cd9
commit 547d0985ea
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/authm_mad/remotes/quota/quota.rb
View File

@ -113,7 +113,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