]> git.puffer.fish Git - matthieu/frr.git/commitdiff
bgpd: merge osr/quagga-osr-patches (BZ#700)
authorDavid Lamparter <equinox@diac24.net>
Mon, 16 Apr 2012 14:46:13 +0000 (16:46 +0200)
committerDavid Lamparter <equinox@diac24.net>
Mon, 16 Apr 2012 14:46:17 +0000 (16:46 +0200)
this merges a bgp capability negotiation fix where bgpd would fail if no
multiprotocol capability was present, but other capabilities were.


Trivial merge