Return-Path: Delivered-To: apmail-harmony-dev-archive@www.apache.org Received: (qmail 62127 invoked from network); 17 Dec 2009 08:58:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Dec 2009 08:58:56 -0000 Received: (qmail 12399 invoked by uid 500); 17 Dec 2009 08:58:56 -0000 Delivered-To: apmail-harmony-dev-archive@harmony.apache.org Received: (qmail 12310 invoked by uid 500); 17 Dec 2009 08:58:56 -0000 Mailing-List: contact dev-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list dev@harmony.apache.org Received: (qmail 12299 invoked by uid 99); 17 Dec 2009 08:58:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Dec 2009 08:58:55 +0000 X-ASF-Spam-Status: No, hits=-6.2 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_MED X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: 195.212.17.163 is neither permitted nor denied by domain of mark.hindess@googlemail.com) Received: from [195.212.17.163] (HELO mtagate3.de.ibm.com) (195.212.17.163) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Dec 2009 08:58:51 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate3.de.ibm.com (8.13.1/8.13.1) with ESMTP id nBH8wUsM024848 for ; Thu, 17 Dec 2009 08:58:30 GMT Received: from d12av01.megacenter.de.ibm.com (d12av01.megacenter.de.ibm.com [9.149.165.212]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id nBH8wUUd1233100 for ; Thu, 17 Dec 2009 09:58:30 +0100 Received: from d12av01.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av01.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id nBH8wUiV008334 for ; Thu, 17 Dec 2009 09:58:30 +0100 Received: from anaheim.local (dhcp-9-20-183-191.hursley.ibm.com [9.20.183.191]) by d12av01.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id nBH8wUxS008329 for ; Thu, 17 Dec 2009 09:58:30 +0100 Message-Id: <200912170858.nBH8wUxS008329@d12av01.megacenter.de.ibm.com> X-Mailer: exmh version 2.7.2 01/07/2005 (debian 1:2.7.2-18) with nmh-1.3 In-reply-to: <3b3f27c60912162057g3ddc6d35xf04ac293cb26e95d@mail.gmail.com> References: <3b3f27c60912162057g3ddc6d35xf04ac293cb26e95d@mail.gmail.com> Comments: In-reply-to Nathan Beyer message dated "Wed, 16 Dec 2009 22:57:23 -0600." From: Mark Hindess To: dev@harmony.apache.org Subject: Re: [java6] Approval for patch to LICENSE Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 17 Dec 2009 08:58:30 +0000 -1. This change wasn't missed from a merge as a merge hasn't happened. Applying this patch wont fix the other missing changes and it wont update mergeinfo property. The correct fix is to merge /repos/asf/harmony/enhanced/trunk to /repos/asf/harmony/enhanced/branches/java6. I'd like permission to do this instead? Any committers approve please? -Mark. In message <3b3f27c60912162057g3ddc6d35xf04ac293cb26e95d@mail.gmail.com>, Nathan Beyer writes: > > Can I get approval to apply the following patch to the LICENSE file in > the java6 branch? This is just a merge from trunk that was missed - > the java6 branch depends on BouncyCastle 1.44. > > Index: LICENSE > =================================================================== > --- LICENSE (revision 891528) > +++ LICENSE (working copy) > @@ -372,10 +372,10 @@ > > > > -License Notice for Bouncy Castle version 1.41 > +License Notice for Bouncy Castle version 1.44 > ============================================= > > -Copyright (c) 2000 - 2008 The Legion Of The Bouncy Castle > (http://www.bouncycastle.org) > +Copyright (c) 2000 - 2009 The Legion Of The Bouncy Castle > (http://www.bouncycastle.org) > > Permission is hereby granted, free of charge, to any person obtaining a copy > of > this software and associated documentation files (the "Software"), to deal i > n >