Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 86063 invoked from network); 1 Jun 2006 07:39:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Jun 2006 07:39:49 -0000 Received: (qmail 97155 invoked by uid 500); 1 Jun 2006 07:39:47 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 96489 invoked by uid 500); 1 Jun 2006 07:39:45 -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 96478 invoked by uid 99); 1 Jun 2006 07:39:45 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 00:39:45 -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.205 as permitted sender) Received: from [64.233.162.205] (HELO nz-out-0102.google.com) (64.233.162.205) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 00:39:44 -0700 Received: by nz-out-0102.google.com with SMTP id m7so205043nzf for ; Thu, 01 Jun 2006 00:39:24 -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=J0DR6aLYtu/aKDGDMm5yMwp06MG8YD93XKa9+iTLQ50hT//stU1MdeuJrwXMJpDPrzKZu/ZkUxhqnY9lHd/AjYpqsUWlaGGz35qns4y2kRdMX6sAotzrH1jCkpHcgg6a3EgMBxTBfat0DwYUImZgG8vtkrXeDPztoIBZl9ULMaQ= Received: by 10.36.127.15 with SMTP id z15mr466978nzc; Thu, 01 Jun 2006 00:39:23 -0700 (PDT) Received: from ?192.168.0.20? ( [59.167.19.4]) by mx.gmail.com with ESMTP id 5sm1335447nzk.2006.06.01.00.39.22; Thu, 01 Jun 2006 00:39:23 -0700 (PDT) Message-ID: <447E999D.3070206@gmail.com> Date: Thu, 01 Jun 2006 17:39:09 +1000 From: John Sisson User-Agent: Thunderbird 1.5.0.2 (Windows/20060308) MIME-Version: 1.0 To: dev@geronimo.apache.org Subject: Re: Merge of 1.1 changes into Trunk complete References: <447E7ABE.9040100@gmail.com> <1b5bfeb50605312340o6d614ecdw73ff314b49bc9f0b@mail.gmail.com> In-Reply-To: <1b5bfeb50605312340o6d614ecdw73ff314b49bc9f0b@mail.gmail.com> 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 Jacek Laskowski wrote: > On 6/1/06, John Sisson wrote: >> I have merged all the changes in the 1.1 branch that weren't merged to >> trunk (since trunk was copied from the 1.1 branch in rev 409124). > > Have you tried to build Geronimo after having done it? ;) (I didn't yet). > >> John > > Jacek > Not yet - you're welcome to give it a go. I used a comparison tool to compare trunk and 1.1 and the only differences I found were version specifications, so in theory it should work :-) Regards, John