From owner-svn-src-head@FreeBSD.ORG Fri Mar 14 03:11:06 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F2A368B for ; Fri, 14 Mar 2014 03:11:06 +0000 (UTC) Received: from mail-qc0-x22c.google.com (mail-qc0-x22c.google.com [IPv6:2607:f8b0:400d:c01::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 009C4297 for ; Fri, 14 Mar 2014 03:11:05 +0000 (UTC) Received: by mail-qc0-f172.google.com with SMTP id i8so2296021qcq.3 for ; Thu, 13 Mar 2014 20:11:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=6aYQ5HwBGOXgpo878Iws8dudh23sGvo3xAfDSAjJ1B4=; b=j/0jEPQ3R5arQ7rCsqhel6uXQjk+XQivj8LJLT0nmlOLNutcdyahRuf+YVlDeV/ott HzvvnGrWidqZfUIMDvuSkbaIsfYidMpI3KD+VXFLscbndpIUGnfgJDitRm00hM8q8+Gg IOgM4O1K30nlePsaVuLe6oFIT1tY8QEXm2V3k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=6aYQ5HwBGOXgpo878Iws8dudh23sGvo3xAfDSAjJ1B4=; b=FRWvABoGo8BvP6+FKqtMXkDEBnnLQhB3vZXQA20CoKgEXWeWvz4i08de600ZKu+NWX vxWOn/lMl1I3ZNbbmi1BcnilTyUo8AWCZRcGiiT+Twi3fgGKxnd7kUWXtAiaJSWUXCfn 4zQWmS6MwdBw1syrdmXaeF+9X4Hbb52CNxVsGnXnidiaFvLFnfYzDjMDHE82Ke7o+gvY dG0MIpJACeLfRQtbzHPbJ+8hrgygWxg9JP78V6709aMXywqLj+36rwnq6wEVnQI5Rqng xeDzIQppelDZX22wYoS13Ll6f9LmzqbZ/+wJQ0ln6QEAOv42dwphMKB6pkw7wpop1/2c EeWQ== X-Gm-Message-State: ALoCoQmMSbLxAjVG9BqSOvOn1zl6xosGb9XdkFF55wJ9iX53qxJBz9N6XnzxUU+0wWc8/eJjs6kN X-Received: by 10.224.7.10 with SMTP id b10mr6991910qab.50.1394766665167; Thu, 13 Mar 2014 20:11:05 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.96.147.225 with HTTP; Thu, 13 Mar 2014 20:10:34 -0700 (PDT) In-Reply-To: <20140314030925.GG40073@FreeBSD.org> References: <201403140307.s2E37q5R039829@svn.freebsd.org> <20140314030925.GG40073@FreeBSD.org> From: Eitan Adler Date: Thu, 13 Mar 2014 23:10:34 -0400 X-Google-Sender-Auth: rTGVt2ha9siuzlkU6eyRvhpplis Message-ID: Subject: Re: svn commit: r263142 - in head: lib/libpam/modules/pam_radius lib/libpam/modules/pam_tacplus sbin/mdconfig secure/usr.bin/bdes share/doc/papers/beyond4.3 share/doc/papers/diskperf share/doc/papers/f... To: Gleb Smirnoff Content-Type: text/plain; charset=UTF-8 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Mar 2014 03:11:06 -0000 On 13 March 2014 23:09, Gleb Smirnoff wrote: > On Fri, Mar 14, 2014 at 03:07:52AM +0000, Eitan Adler wrote: > E> Author: eadler > E> Date: Fri Mar 14 03:07:51 2014 > E> New Revision: 263142 > E> URL: http://svnweb.freebsd.org/changeset/base/263142 > E> > E> Log: > E> multiple: Remove 3rd clause from BSD license where approved by the > E> regents and renumber. > E> > E> This patch skips files in contrib/ and crypto/ > E> > E> Acked by: imp > E> Discussed with: emaste > E> > E> Added: > E> head/usr.sbin/IPXrouted/ > E> - copied from r262539, head/usr.sbin/IPXrouted/ > > Seems like you blindly did "mine full", when subversion reported > you a merge conflict. I thought I hit "theirs full". I noticed this and am working on fixing it. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams