From owner-freebsd-bugs@FreeBSD.ORG  Thu Apr 13 18:00:36 2006
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
X-Original-To: freebsd-bugs@hub.freebsd.org
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3247916A406
	for <freebsd-bugs@hub.freebsd.org>;
	Thu, 13 Apr 2006 18:00:36 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 13FC543D5C
	for <freebsd-bugs@hub.freebsd.org>;
	Thu, 13 Apr 2006 18:00:35 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3DI0Yg4070313
	for <freebsd-bugs@freefall.freebsd.org>; Thu, 13 Apr 2006 18:00:34 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3DI0YDf070312;
	Thu, 13 Apr 2006 18:00:34 GMT (envelope-from gnats)
Date: Thu, 13 Apr 2006 18:00:34 GMT
Message-Id: <200604131800.k3DI0YDf070312@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Rostislav Krasny <rosti.bsd@gmail.com>
Cc: 
Subject: Re: conf/95634: sendmail configuration isn't updated after 8.13.4
 to 8.13.6 update
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Rostislav Krasny <rosti.bsd@gmail.com>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Apr 2006 18:00:36 -0000

The following reply was made to PR conf/95634; it has been noted by GNATS.

From: Rostislav Krasny <rosti.bsd@gmail.com>
To: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Cc: freebsd-bugs@FreeBSD.org, freebsd-gnats-submit@freebsd.org
Subject: Re: conf/95634: sendmail configuration isn't updated after 8.13.4
 to 8.13.6 update
Date: Thu, 13 Apr 2006 20:49:22 +0300

 On Thu, 13 Apr 2006 04:14:38 GMT
 Gregory Neil Shapiro <gshapiro@FreeBSD.org> wrote:
 
 > I did a force commit on src/etc/sendmail/freebsd*mc and verified
 > mergemaster now asks to merge /etc/mail/freebsd*cf.  I've done the
 > forced commit in HEAD, RELENG_6_1, RELENG_6, RELENG_5, and RELENG_4.
 > 
 > I've also added a note to FREEBSD-upgrade for future imports.
 
 The mergemaster also asks to merge /etc/mail/sendmail.cf
 and /etc/mail/submit.cf, that is right.
 Well done, thank you!