Merge branch 'rt-accepted'
Conflicts: nest/config.Y nest/rt-table.c proto/bgp/bgp.c
Showing
- nest/config.Y 11 additions, 4 deletionsnest/config.Y
- nest/route.h 5 additions, 3 deletionsnest/route.h
- nest/rt-table.c 335 additions, 157 deletionsnest/rt-table.c
- proto/bgp/attrs.c 2 additions, 1 deletionproto/bgp/attrs.c
- proto/bgp/bgp.c 13 additions, 1 deletionproto/bgp/bgp.c
- proto/bgp/bgp.h 1 addition, 0 deletionsproto/bgp/bgp.h
- proto/bgp/config.Y 3 additions, 1 deletionproto/bgp/config.Y
Please register or sign in to comment