From 3690074a486cfada568975e287d9cbb9e687501f Mon Sep 17 00:00:00 2001
From: Chris Hall <chris.hall@highwayman.com>
Date: Fri, 2 Sep 2011 00:53:59 +0100
Subject: Merging of euro_ix branch into pipework.

Bring in fixes for bgp dumping with pthreaded BGP Engine.

Bring in new "show nexus xxx" command.

Fix removal of '~' prompt.
---
 lib/memtypes.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/memtypes.c')

diff --git a/lib/memtypes.c b/lib/memtypes.c
index 66d65328..11adeced 100644
--- a/lib/memtypes.c
+++ b/lib/memtypes.c
@@ -140,7 +140,8 @@ struct memory_list memory_list_bgp[] =
   { MTYPE_AS_PATH,		"BGP aspath"			},
   { MTYPE_AS_SEG,		"BGP aspath seg"		},
   { MTYPE_AS_SEG_DATA,		"BGP aspath segment data"	},
-  { MTYPE_AS_STR,		"BGP aspath str"		},
+  { MTYPE_AS_STR,               "BGP aspath str"                },
+  { MTYPE_BGP_DUMP,             "BGP MRT dump item"             },
   { 0, NULL },
   { MTYPE_BGP_TABLE,		"BGP table"			},
   { MTYPE_BGP_NODE,		"BGP node"			},
-- 
cgit v1.2.3