git.puffer.fish Git - mirror/frr.git/commit

]> git.puffer.fish Git - mirror/frr.git/commit

projects / mirror / frr.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0577b82 8793176)

author	David Lamparter <equinox@opensourcerouting.org>
	Mon, 5 Dec 2016 18:43:38 +0000 (19:43 +0100)
committer	David Lamparter <equinox@opensourcerouting.org>
	Mon, 5 Dec 2016 18:48:38 +0000 (19:48 +0100)
commit	53dc2b05c76f4f5cd6a72373fb241afdcedb2ee1
tree	d43e2f4f851f368dcc943a9b30e73ff603ea5bc1	tree \| snapshot
parent	0577b824e137f143c899a567b1bbeb109841c796	commit \| diff
parent	8793176b5a180bff8e637ce7cba6005f880e8915	commit \| diff

Merge branch 'stable/2.0'

Conflicts:
bgpd/bgp_route.c
lib/if.c
ripd/rip_interface.c
zebra/interface.c
zebra/zebra_vty.c

28 files changed:

bgpd/bgp_fsm.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_nexthop.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	diff1 \|	diff2 \|	blob \| history
lib/command.c	diff1 \|	diff2 \|	blob \| history
lib/if.c	diff1 \|	diff2 \|	blob \| history
lib/ns.c	diff1 \|	diff2 \|	blob \| history
lib/vrf.c	diff1 \|	diff2 \|	blob \| history
lib/vrf.h	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_vty.c	diff1 \|	diff2 \|	blob \| history
ripd/rip_interface.c	diff1 \|	diff2 \|	blob \| history
ripd/ripd.c	diff1 \|	diff2 \|	blob \| history
ripd/ripd.h	diff1 \|	diff2 \|	blob \| history
ripngd/ripng_interface.c	diff1 \|	diff2 \|	blob \| history
ripngd/ripngd.c	diff1 \|	diff2 \|	blob \| history
zebra/if_netlink.c	diff1 \|	diff2 \|	blob \| history
zebra/interface.c	diff1 \|	diff2 \|	blob \| history
zebra/router-id.c	diff1 \|	diff2 \|	blob \| history
zebra/rt_netlink.c	diff1 \|	diff2 \|	blob \| history
zebra/rtadv.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_fpm.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_fpm_netlink.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rnh_null.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_routemap.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_static.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vrf.c	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vty.c	diff1 \|	diff2 \|	blob \| history
zebra/zserv.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.