Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 72384 invoked from network); 24 May 2006 13:07:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 May 2006 13:07:27 -0000 Received: (qmail 22546 invoked by uid 500); 24 May 2006 13:07:23 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 22498 invoked by uid 500); 24 May 2006 13:07:23 -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 22487 invoked by uid 99); 24 May 2006 13:07:23 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 May 2006 06:07:23 -0700 X-ASF-Spam-Status: No, hits=1.2 required=10.0 tests=RCVD_IN_SORBS_WEB,SPF_HELO_PASS X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [63.208.196.171] (HELO outbound.mailhop.org) (63.208.196.171) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 May 2006 06:07:22 -0700 Received: from bi01p1.nc.us.ibm.com ([129.33.49.251] helo=[9.37.214.136]) by outbound.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.51) id 1Fit4n-000Hwk-PB for dev@geronimo.apache.org; Wed, 24 May 2006 09:07:01 -0400 X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 129.33.49.251 X-Report-Abuse-To: abuse@dyndns.com (see http://www.mailhop.org/outbound/abuse.html for abuse reporting information) X-MHO-User: hogndos Message-ID: <44745A73.5030805@hogstrom.org> Date: Wed, 24 May 2006 09:06:59 -0400 From: Matt Hogstrom User-Agent: Thunderbird 1.5.0.2 (Macintosh/20060308) MIME-Version: 1.0 To: dev@geronimo.apache.org Subject: Re: trunk 1.2-SNAPSHOT is now live ! References: <44744EA6.2020405@hogstrom.org> <4474508C.2010402@gmail.com> In-Reply-To: <4474508C.2010402@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 Rick McGuire wrote: > Matt Hogstrom wrote: >> I implemented the changes in GERONIMO-2053 to save trunk as >> branches/dead-1.2 and bring branches/1.1 into trunk. >> >> If there are additional changes that are required to complete the >> conversion to 1.2-SNAPSHOT please document them in GERONIMO-2053 > Is this for the work to pull changes from dead-1.2 into the new trunk, > or is this for other sorts of issues? > You can now grab anything you want from branches/dead-1.2 and merge it with trunk. >> http://issues.apache.org/jira/browse/GERONIMO-2053 so we can track >> them. I'll leave this open for a few days. >> >> Also, remember that any fixes made to branches/1.1 should also be >> applied to trunk. > Can we start moving code from dead-1.2 into trunk now? > Yes. >> >> Cheers, >> >> Matt >> > > > >