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 /isisd/isis_routemap.c | |
| 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 'isisd/isis_routemap.c')
| -rw-r--r-- | isisd/isis_routemap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/isisd/isis_routemap.c b/isisd/isis_routemap.c index 93267afe9..1d734fbc2 100644 --- a/isisd/isis_routemap.c +++ b/isisd/isis_routemap.c @@ -254,7 +254,6 @@ void isis_route_map_init(void) { route_map_init(); - route_map_init_vty(); route_map_match_ip_address_hook (generic_match_add); route_map_no_match_ip_address_hook (generic_match_delete); |