Skip to content

Commit

Permalink
Updated docs
Browse files Browse the repository at this point in the history
  • Loading branch information
mchf committed Jun 8, 2015
1 parent 0056d45 commit eca45a5
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/lib/network/network_autoyast.rb
Expand Up @@ -87,6 +87,15 @@ def merge_dns(instsys_dns, ay_dns)
instsys_dns.delete_if { |k,v| k == "write_hostname" }.merge(ay_dns)
end

# Merges two maps with routing related values
#
# Value in second map has precendence over the value in first one in
# case of key collision.
#
# @param instsys_routing [Hash, nil] first map with routing configuration
# @param ay_routing [Hash, nil] second map with routing configuration
#
# @return merged DNS maps or empty map
def merge_routing(instsys_routing, ay_routing)
ay_routing ||= {}
instsys_routing ||= {}
Expand Down

0 comments on commit eca45a5

Please sign in to comment.