Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 8628 invoked from network); 1 Jun 2006 03:23:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Jun 2006 03:23:04 -0000 Received: (qmail 56324 invoked by uid 500); 1 Jun 2006 03:22:58 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 56282 invoked by uid 500); 1 Jun 2006 03:22:58 -0000 Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list dev@geronimo.apache.org Received: (qmail 56271 invoked by uid 99); 1 Jun 2006 03:22:58 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 May 2006 20:22:58 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: domain of jrsisson@gmail.com designates 64.233.162.203 as permitted sender) Received: from [64.233.162.203] (HELO nz-out-0102.google.com) (64.233.162.203) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 May 2006 20:22:56 -0700 Received: by nz-out-0102.google.com with SMTP id m7so171387nzf for ; Wed, 31 May 2006 20:22:36 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:user-agent:mime-version:to:subject:references:in-reply-to:content-type:content-transfer-encoding; b=jVGYfCs+8KT4m5isS/FgJkh06yLvYLcHi1h/G51m34MfkduDXmiwJqEsjXclX8HWrpWH/iHnU0FgK2+1oKGbFbYEBSLkLXpYtU48U5uCAMyRZ9XRYxeGGDhJ8zpmRclBpjCSvQCQDwFkMA7JxK7M2G8l+N0SITufMn7L9CpaI0w= Received: by 10.36.19.13 with SMTP id 13mr212890nzs; Wed, 31 May 2006 20:22:36 -0700 (PDT) Received: from ?192.168.0.20? ( [59.167.19.4]) by mx.gmail.com with ESMTP id i5sm459842nzi.2006.05.31.20.22.34; Wed, 31 May 2006 20:22:35 -0700 (PDT) Message-ID: <447E5D6E.7010003@gmail.com> Date: Thu, 01 Jun 2006 13:22:22 +1000 From: John Sisson User-Agent: Thunderbird 1.5.0.2 (Windows/20060308) MIME-Version: 1.0 To: dev@geronimo.apache.org Subject: Re: Merging 1.1 changes to trunk References: <447E4CDC.4090407@gmail.com> <447E55FA.1040703@hogstrom.org> In-Reply-To: <447E55FA.1040703@hogstrom.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N I'll do your merge. John Matt Hogstrom wrote: > My comments below. Will you do the merge John or should we do it > after you wave the flag ? > > Matt > > John Sisson wrote: >> There have been a number of changes in the 1.1 branch that haven't >> been merged to trunk since trunk was copied from the 1.1 branch in >> rev 409124. >> >> We should try to merge these in revision order as much as possible, >> as there will be less chance that my svn properties fix (rev 409817) >> will have problems merging files that have their eol-style changed. >> Please hold off merging any other changes to trunk until we have >> merged these ones. >> >> Thanks, >> >> John >> >> 1.1 Change and associated trunk change >> -------------------------------------- >> http://svn.apache.org/viewvc?rev=409165&view=rev (hogstrom) >> http://svn.apache.org/viewvc?rev=409166&view=rev (hogstrom) > > This was done...is there a followup required ? >> >> http://svn.apache.org/viewvc?rev=409179&view=rev (hogstrom) >> http://svn.apache.org/viewvc?rev=409183&view=rev (hogstrom) > > Same here. > >> http://svn.apache.org/viewvc?rev=409201&view=rev (ammulder) >> http://svn.apache.org/viewvc?rev=409223&view=rev (ammulder) >> >> http://svn.apache.org/viewvc?rev=409288&view=rev (kevan) >> *** Merge required ?? *** >> >> http://svn.apache.org/viewvc?rev=409290&view=rev (ammulder) >> http://svn.apache.org/viewvc?rev=409293&view=rev (ammulder) >> >> http://svn.apache.org/viewvc?rev=409292&view=rev (jsisson) >> Merge not required. >> >> http://svn.apache.org/viewvc?rev=409295&view=rev (ammulder) >> http://svn.apache.org/viewvc?rev=409296&view=rev (ammulder) >> >> http://svn.apache.org/viewvc?rev=409305&view=rev (djencks) >> *** Merge required ?? *** >> >> http://svn.apache.org/viewvc?rev=409481&view=rev (hcunico) >> *** Merge required ?? *** >> >> http://svn.apache.org/viewvc?rev=409499&view=rev (hogstrom) >> *** Merge required ?? *** > > Yes a merge should be done. > >> >> http://svn.apache.org/viewvc?rev=409508&view=rev (jsisson) >> *** Merge required *** >> >> http://svn.apache.org/viewvc?rev=409513&view=rev (jsisson) >> *** Merge required *** >> >> http://svn.apache.org/viewvc?rev=409514&view=rev >> *** Merge required ?? *** >> >> http://svn.apache.org/viewvc?rev=409761&view=rev (ammulder) >> http://svn.apache.org/viewvc?rev=409771&view=rev & >> http://svn.apache.org/viewvc?rev=409961&view=rev (ammulder) >> >> http://svn.apache.org/viewvc?rev=409817&view=rev (jsisson) This is >> the svn properties fix. >> *** Merge required *** >> >> http://svn.apache.org/viewvc?rev=409824&view=rev (gdamour) >> *** Merge required ?? *** >> >> http://svn.apache.org/viewvc?rev=410129&view=rev (djencks) >> http://svn.apache.org/viewvc?rev=410301&view=rev (djencks) >> >> http://svn.apache.org/viewvc?rev=410498&view=rev (jsisson) >> *** Merge required *** >> >> http://svn.apache.org/viewvc?rev=410654&view=rev (kevan) >> *** Merge required ?? *** >> >> http://svn.apache.org/viewvc?rev=410704&view=rev >> *** Merge required *** >> >> >> >