From owner-cvs-all  Wed Dec  5  3: 0:27 2001
Delivered-To: cvs-all@freebsd.org
Received: from gvr.gvr.org (gvr.gvr.org [212.61.40.17])
	by hub.freebsd.org (Postfix) with ESMTP
	id 13D5937B417; Wed,  5 Dec 2001 03:00:24 -0800 (PST)
Received: by gvr.gvr.org (Postfix, from userid 657)
	id 8FC755809; Wed,  5 Dec 2001 12:00:22 +0100 (CET)
Date: Wed, 5 Dec 2001 12:00:22 +0100
From: Guido van Rooij <guido@gvr.org>
To: Sheldon Hearn <sheldonh@starjuice.net>
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/share/man/man5 rc.conf.5 src/etc rc.network rc.shutdown src/etc/defaults rc.conf
Message-ID: <20011205120022.A74753@gvr.gvr.org>
References: <200112051050.fB5Ao7n40914@freefall.freebsd.org> <47710.1007549884@axl.seasidesoftware.co.za>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <47710.1007549884@axl.seasidesoftware.co.za>; from sheldonh@starjuice.net on Wed, Dec 05, 2001 at 12:58:04PM +0200
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

On Wed, Dec 05, 2001 at 12:58:04PM +0200, Sheldon Hearn wrote:
> >   MFC: IP Filter rc.* reorganisation plus documentation of it.
> >   While this adds functionaility to save state and nat tables across
> >   reboots, saving nat tables will still cause a panic. The fix will
> >   be MFC-ed in 3 days
> 
> The fix will be merged from what branch to what branch in 3 days?

The fix for ip_nat.c will be merged form current to stable in 3 days.

-Guido

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message