From owner-freebsd-bugs@FreeBSD.ORG Thu Apr 13 04:14:39 2006 Return-Path: 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 A7D6816A402; Thu, 13 Apr 2006 04:14:39 +0000 (UTC) (envelope-from gshapiro@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3AC743D53; Thu, 13 Apr 2006 04:14:38 +0000 (GMT) (envelope-from gshapiro@FreeBSD.org) Received: from freefall.freebsd.org (gshapiro@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3D4EcC3017928; Thu, 13 Apr 2006 04:14:38 GMT (envelope-from gshapiro@freefall.freebsd.org) Received: (from gshapiro@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3D4EcRN017924; Thu, 13 Apr 2006 04:14:38 GMT (envelope-from gshapiro) Date: Thu, 13 Apr 2006 04:14:38 GMT From: Gregory Neil Shapiro Message-Id: <200604130414.k3D4EcRN017924@freefall.freebsd.org> To: rosti.bsd@gmail.com, gshapiro@FreeBSD.org, freebsd-bugs@FreeBSD.org 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 List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Apr 2006 04:14:39 -0000 Synopsis: sendmail configuration isn't updated after 8.13.4 to 8.13.6 update State-Changed-From-To: open->closed State-Changed-By: gshapiro State-Changed-When: Thu Apr 13 04:13:12 UTC 2006 State-Changed-Why: 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. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=95634