From b5f29603399070041289729e175fbec085e8e904 Mon Sep 17 00:00:00 2001
From: hasso <hasso>
Date: Wed, 25 May 2005 21:00:28 +0000
Subject: 	* bgpd.c: Fix obvious (routeserver patch) merge error. This
 makes "no 	  neighbor x.x.x.x routemap [export|import] commands work
 again.

	Fixes bugzilla #184. [backport candidate]
---
 bgpd/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'bgpd/ChangeLog')

diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 686a6424..826b930f 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-25 Hasso Tepper <hasso at quagga.net>
+
+	* bgpd.c: Fix obvious (routeserver patch) merge error. This makes "no
+	  neighbor x.x.x.x routemap [export|import] commands work again.
+
 2005-05-23 Paul Jakma <paul@dishone.st>
 
 	* bgp_routemap.c: add semi-colons to VTY_GET_* to match vty.h change
-- 
cgit v1.2.1