]> git.proxmox.com Git - mirror_frr.git/commit
Merge branch 'quagga' into google-bgp-multipath
authorAvneesh Sachdev <avneesh@opensourcerouting.org>
Mon, 9 Apr 2012 07:25:15 +0000 (00:25 -0700)
committerAvneesh Sachdev <avneesh@opensourcerouting.org>
Mon, 9 Apr 2012 07:25:15 +0000 (00:25 -0700)
commit3cf6c2b4e43f44a977d218c96c26250654ae333e
treee017cde2015fbf3ef6c250327428d7c6152aa8f7
parent01d7ff0a2166a422c56bd26f04fc22832a9e690b
parente96b312150d8e376c1ef463793d1929eca3618d5
Merge branch 'quagga' into google-bgp-multipath

Conflicts:
bgpd/bgp_route.c
13 files changed:
bgpd/bgp_aspath.c
bgpd/bgp_aspath.h
bgpd/bgp_ecommunity.c
bgpd/bgp_ecommunity.h
bgpd/bgp_main.c
bgpd/bgp_route.c
bgpd/bgp_route.h
bgpd/bgp_vty.c
bgpd/bgp_zebra.c
bgpd/bgp_zebra.h
bgpd/bgpd.c
bgpd/bgpd.h
lib/memtypes.c