]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #3045 from opensourcerouting/atoms
authorLou Berger <lberger@labn.net>
Tue, 30 Apr 2019 14:26:35 +0000 (10:26 -0400)
committerGitHub <noreply@github.com>
Tue, 30 Apr 2019 14:26:35 +0000 (10:26 -0400)
READY: lists/skiplists/rb-trees new API & sequence lock & atomic lists

1  2 
isisd/isis_lsp.c
isisd/isis_misc.c
isisd/isis_northbound.c
isisd/isis_pdu.c
isisd/isis_te.c
isisd/isis_zebra.c
isisd/isisd.c
isisd/isisd.h
lib/privs.c
zebra/zebra_rib.c
zebra/zebra_vxlan.c

Simple merge
index 2ce68262ebd7e3822bc7df45cf66641d8df4cff2,ef0d77d6c5f486853c944419fe07178a93ace438..0a42adea37ba4aade5673025b52bd10f1e02cac1
@@@ -28,8 -28,8 +28,7 @@@
  #include "hash.h"
  #include "if.h"
  #include "command.h"
 -#include "log_int.h"
  
- #include "isisd/dict.h"
  #include "isisd/isis_constants.h"
  #include "isisd/isis_common.h"
  #include "isisd/isis_flags.h"
Simple merge
Simple merge
diff --cc isisd/isis_te.c
Simple merge
Simple merge
diff --cc isisd/isisd.c
Simple merge
diff --cc isisd/isisd.h
Simple merge
diff --cc lib/privs.c
Simple merge
Simple merge
Simple merge