bgpd/bgpd.c | 2 +- bgpd/bgpd.h | 3 +++ debian/changelog | 6 ++++++ lib/smux.c | 2 +- zebra/main.c | 3 +++ zebra/zserv.c | 18 +++++++++++------- zebra/zserv.h | 1 + 7 files changed, 26 insertions(+), 9 deletions(-)
New commits: commit 78bd75cd33af1bc4510a9a5bf296b83556256a6f Author: Stephen Hemminger <[email protected]> Date: Fri Jul 24 11:57:50 2009 -0700 0.99.14-3 commit f2112792cc2249ce8a4bcb6e3792d89abc0bd48b Author: Stephen Hemminger <[email protected]> Date: Fri Jul 24 11:55:01 2009 -0700 Merge branch 'upstream' into kenwood Conflicts: bgpd/bgp_network.c bgpd/bgpd.c doc/zebra.8 lib/smux.c zebra/main.c zebra/rt_netlink.c http://suva.vyatta.com/git/?p=vyatta-quagga.git;a=commitdiff;h=78bd75cd33af1bc4510a9a5bf296b83556256a6f http://suva.vyatta.com/git/?p=vyatta-quagga.git;a=commitdiff;h=f2112792cc2249ce8a4bcb6e3792d89abc0bd48b _______________________________________________ svn mailing list [email protected] http://mailman.vyatta.com/mailman/listinfo/svn
