diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-20 18:31:49 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-20 18:31:49 +0200 |
| commit | 0a538fc98fb662b4cf2d927ac29fd9af4a4fab03 (patch) | |
| tree | f6dbe2af92d44f9a77e4802cefb440811dd69584 /ripd | |
| parent | Merge branch 'cmaster-next' into vtysh-grammar (diff) | |
| parent | lib: Fix redist memory free'ing (diff) | |
| download | frr-0a538fc98fb662b4cf2d927ac29fd9af4a4fab03.tar.xz frr-0a538fc98fb662b4cf2d927ac29fd9af4a4fab03.zip | |
Merge branch 'cmaster-next' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
isisd/isis_routemap.c
zebra/rt_netlink.c
Diffstat (limited to 'ripd')
| -rw-r--r-- | ripd/rip_routemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ripd/rip_routemap.c b/ripd/rip_routemap.c index 60ce66265..6fd647596 100644 --- a/ripd/rip_routemap.c +++ b/ripd/rip_routemap.c @@ -599,7 +599,7 @@ void rip_route_map_init () { route_map_init (); - route_map_init_vty (); + route_map_add_hook (rip_route_map_update); route_map_delete_hook (rip_route_map_update); |