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

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

projects / matthieu / frr.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 01d7ff0 e96b312)

author	Avneesh Sachdev <avneesh@opensourcerouting.org>
	Mon, 9 Apr 2012 07:25:15 +0000 (00:25 -0700)
committer	Avneesh Sachdev <avneesh@opensourcerouting.org>
	Mon, 9 Apr 2012 07:25:15 +0000 (00:25 -0700)
commit	3cf6c2b4e43f44a977d218c96c26250654ae333e
tree	e017cde2015fbf3ef6c250327428d7c6152aa8f7	tree \| snapshot
parent	01d7ff0a2166a422c56bd26f04fc22832a9e690b	commit \| diff
parent	e96b312150d8e376c1ef463793d1929eca3618d5	commit \| diff

Merge branch 'quagga' into google-bgp-multipath

Conflicts:
bgpd/bgp_route.c

13 files changed:

bgpd/bgp_aspath.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_aspath.h	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_ecommunity.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_ecommunity.h	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_main.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.h	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_vty.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_zebra.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_zebra.h	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	diff1 \|	diff2 \|	blob \| history
lib/memtypes.c	diff1 \|	diff2 \|	blob \| history

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