Merge commit 'origin/master' into new

This commit is contained in:
Ondrej Zajicek 2009-12-22 01:34:01 +01:00
commit 0ad19261bf
2 changed files with 3 additions and 3 deletions

4
NEWS
View file

@ -1,6 +1,6 @@
Version 1.1.7 (2009-12-21)
Version 1.1.7 (2009-12-20)
o Implements BGP Route Refresh (RFC 2918).
o Implements route reload feature.
o Implements route reload command.
o Deep changes and bugfixes in pipe protocol.
o Bugfix in OSPF premature aging of LSA.
o Bugfix in OSPF next hop calculation.

View file

@ -1536,7 +1536,7 @@ Default is <cf/metric of type 2 = 10000/ and <cf/tag = 0/.
<code>
protocol ospf MyOSPF {
rfc1583compatibility yes;
rfc1583compat yes;
tick 2;
export filter {
if source = RTS_BGP then {