diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-12-06 19:51:33 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-12-06 19:51:33 +0000 |
| commit | 6fd800be4ac4da8ec034f2a858e0183b8ae9bb01 (patch) | |
| tree | e1a77a68567f6496415b6476a6bed52c77d64619 /zebra/zebra_memory.h | |
| parent | 3d6e734154e6da17423e9054b5443774cacfdd51 (diff) | |
| parent | 9dec6b446c5487623ad04fdaa8160e3338f12799 (diff) | |
Merge remote-tracking branch 'osr/master' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
lib/command_match.c
Diffstat (limited to 'zebra/zebra_memory.h')
| -rw-r--r-- | zebra/zebra_memory.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/zebra/zebra_memory.h b/zebra/zebra_memory.h index fbd8f3261d..c1ac4fe955 100644 --- a/zebra/zebra_memory.h +++ b/zebra/zebra_memory.h @@ -35,6 +35,5 @@ DECLARE_MTYPE(STATIC_ROUTE) DECLARE_MTYPE(RIB_DEST) DECLARE_MTYPE(RIB_TABLE_INFO) DECLARE_MTYPE(RNH) -DECLARE_MTYPE(NETLINK_NAME) #endif /* _QUAGGA_ZEBRA_MEMORY_H */ |