proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 10:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8708 from LabNConsulting/chopps/fix-lyd-merge-use

Browse Source 
lib: fix northbound merge code (libyang)
This commit is contained in:
Igor Ryzhov 2021-05-20 17:04:54 +03:00 committed by GitHub
commit 46ea9d49c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/northbound.c
View File

@ -336,7 +336,7 @@ int nb_config_merge(struct nb_config *config_dst, struct nb_config *config_src,
{ {
int ret; int ret;
ret = lyd_merge_tree(&config_dst->dnode, config_src->dnode, 0); ret = lyd_merge_siblings(&config_dst->dnode, config_src->dnode, 0);
if (ret != 0) if (ret != 0)
flog_warn(EC_LIB_LIBYANG, "%s: lyd_merge() failed", __func__); flog_warn(EC_LIB_LIBYANG, "%s: lyd_merge() failed", __func__);