diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2012-03-22 16:40:53 +0000 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2012-03-22 16:40:53 +0000 |
| commit | 97f375b3e02e0f4ec18f68fbe36fc5ae16693d26 (patch) | |
| tree | d0f89e2217723160b33c6632502e4f8eff6c3305 /ospfd/ospf_apiserver.c | |
| parent | 508e7f2b7d78b1352e2bc1b282937ef7ab138a18 (diff) | |
| parent | 87f81eae2a74580e58cd9bed13a4c62306181d04 (diff) | |
| download | quagga-ex22b.tar.bz2 quagga-ex22b.tar.xz | |
Merge commit 'quagga_0_99_20_1_release' into euro_ix_bex22b
v0.99.20ex22b
Conflicts:
bgpd/bgp_open.c
bgpd/bgp_packet.c
The bpp_open.c code has been replaced by code in bgp_open_state.c, so
these changes have no effect on the euro_ix branch, which already
rejects invalid OPEN with a NOTIFY.
Otherwise:
modified: ospfd/ospf_dump.c
modified: ospfd/ospf_dump.h
modified: ospfd/ospf_lsa.h
modified: ospfd/ospf_packet.c
modified: ospfd/ospf_packet.h
Diffstat (limited to 'ospfd/ospf_apiserver.c')
0 files changed, 0 insertions, 0 deletions