]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #3378 from opensourcerouting/remove-config-lock
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 30 Nov 2018 23:50:49 +0000 (18:50 -0500)
committerGitHub <noreply@github.com>
Fri, 30 Nov 2018 23:50:49 +0000 (18:50 -0500)
*: remove the configuration lock from all daemons

1  2 
lib/command.c
lib/northbound_cli.c
lib/vty.h
zebra/main.c

diff --cc lib/command.c
Simple merge
Simple merge
diff --cc lib/vty.h
Simple merge
diff --cc zebra/main.c
index 5b5ee8259a915239cf7e7a7d9e076bc65cbff9e8,95fe6f9fef8f9ea13486096a859af2f6fb2ff7f5..0f1e14821bcaed5343ad3c3a67dfa91f2823ce63
@@@ -390,12 -387,8 +390,11 @@@ int main(int argc, char **argv
                }
        }
  
-       vty_config_lockless();
        zebrad.master = frr_init();
  
 +      /* Initialize pthread library */
 +      frr_pthread_init();
 +
        /* Zebra related initialize. */
        zebra_router_init();
        zserv_init();