Commit db7f698d authored by Francis Dupont's avatar Francis Dupont
Browse files

[4097a] Removed merging of global configured options into subnets

parent e0c80090
......@@ -264,6 +264,8 @@ public:
/// as a parameter. If an item exists in the destination it is not
/// copied.
///
/// @note: this method is not longer used so should become private.
///
/// @param [out] other Configuration object to merge to.
void mergeTo(CfgOption& other) const;
......
......@@ -1256,8 +1256,10 @@ SubnetConfigParser::createSubnet() {
subnet_->setIface(iface);
}
// Merge globally defined options to the subnet specific options.
CfgMgr::instance().getStagingCfg()->getCfgOption()->mergeTo(*options_);
// Here globally defined options were merged to the subnet specific
// options but it is no longer the case (they have a different
// and not consecutive priority).
// Copy all options to the subnet configuration.
options_->copyTo(*subnet_->getCfgOption());
// Append suboptions to the top-level options.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment