From owner-svn-src-stable-9@FreeBSD.ORG Fri Mar 15 18:55:13 2013 Return-Path: Delivered-To: svn-src-stable-9@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 203C6F63; Fri, 15 Mar 2013 18:55:13 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (lor.one-eyed-alien.net [69.66.77.232]) by mx1.freebsd.org (Postfix) with ESMTP id 5060E854; Fri, 15 Mar 2013 18:55:12 +0000 (UTC) Received: from lor.one-eyed-alien.net (localhost [127.0.0.1]) by lor.one-eyed-alien.net (8.14.5/8.14.5) with ESMTP id r2FIt9rO044339; Fri, 15 Mar 2013 13:55:09 -0500 (CDT) (envelope-from brooks@lor.one-eyed-alien.net) Received: (from brooks@localhost) by lor.one-eyed-alien.net (8.14.5/8.14.5/Submit) id r2FIt9h1044338; Fri, 15 Mar 2013 13:55:09 -0500 (CDT) (envelope-from brooks) Date: Fri, 15 Mar 2013 13:55:09 -0500 From: Brooks Davis To: Brooks Davis Subject: Re: svn commit: r248335 - in stable/9: . etc Message-ID: <20130315185509.GA43965@lor.one-eyed-alien.net> References: <201303151849.r2FIndT9025095@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3MwIy2ne0vdjdPXF" Content-Disposition: inline In-Reply-To: <201303151849.r2FIndT9025095@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-stable-9@FreeBSD.org X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2013 18:55:13 -0000 --3MwIy2ne0vdjdPXF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 15, 2013 at 06:49:39PM +0000, Brooks Davis wrote: > Author: brooks > Date: Fri Mar 15 18:49:39 2013 > New Revision: 248335 > URL: http://svnweb.freebsd.org/changeset/base/248335 >=20 > Log: > MFC: > r241684,245316,245318,245440,245563,245565,245622,245754,246092,246096,= 246602 The primary purpose of this commit was to merge DB_FROM_SRC. LOCAL_MTREE ended up touching to many of the same lines to not merge it as well without more risk that I wanted to take so I merged them together. -- Brooks --3MwIy2ne0vdjdPXF Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iD8DBQFRQ26NXY6L6fI4GtQRApVEAKCO53BDVp0qhvpDi4TC02eQ+tGCcACfaDE0 j9LAKy8T6t2Eyz+9rdXVbGY= =tEtU -----END PGP SIGNATURE----- --3MwIy2ne0vdjdPXF--