Return-Path: Delivered-To: apmail-archiva-dev-archive@www.apache.org Received: (qmail 26814 invoked from network); 10 Sep 2010 05:36:12 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Sep 2010 05:36:12 -0000 Received: (qmail 15606 invoked by uid 500); 10 Sep 2010 05:36:12 -0000 Delivered-To: apmail-archiva-dev-archive@archiva.apache.org Received: (qmail 15471 invoked by uid 500); 10 Sep 2010 05:36:09 -0000 Mailing-List: contact dev-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list dev@archiva.apache.org Received: (qmail 15463 invoked by uid 99); 10 Sep 2010 05:36:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Sep 2010 05:36:08 +0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests=FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of odeaching@gmail.com designates 209.85.216.177 as permitted sender) Received: from [209.85.216.177] (HELO mail-qy0-f177.google.com) (209.85.216.177) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Sep 2010 05:36:01 +0000 Received: by qyk8 with SMTP id 8so2620740qyk.15 for ; Thu, 09 Sep 2010 22:35:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:content-type; bh=uwq6mzzHSyT880MwKqozMt/UcobJJ0Hl5Ur8zjxAsIQ=; b=Py5MsqvyvMmEgzvr4fX8/JU+An1ru/G8YtgBADrdNJG4+CFCp7RzSLCzZ7Iq/SvoIL CR2GEuBizStdzWyTF6zGW2pomz7CmmG9oG6u6BcZTDDht9rnzkfrcsdUiRMj3jt0W4Ul BINOgSzhPVTsU0kt22mRRG3twXgk52T5cjSUY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type; b=HAWIwDJPxJi+w3UbFojDceWFi2YsNFyLI9LtTG7LsuVdCzGa2ES0ka4pUFYyjnbSbl hITmGi/8k4CtfvSk1PqXvx3y/UUr0l5wgXzf/Vhx0qSU9H9EJl3/Ni88TlrIIKY7deO3 J1qbsG7YN9e9ef38xunsxBCiFZETNo896VzlI= MIME-Version: 1.0 Received: by 10.229.1.162 with SMTP id 34mr195416qcf.226.1284096940483; Thu, 09 Sep 2010 22:35:40 -0700 (PDT) Sender: odeaching@gmail.com Received: by 10.229.86.3 with HTTP; Thu, 9 Sep 2010 22:35:40 -0700 (PDT) In-Reply-To: <0C220542-A27F-41F0-B3E8-35E7119E13C7@apache.org> References: <53D3E6A0-EC8A-4926-8A11-7232D89648E5@apache.org> <510CFF46-A463-4BD1-B983-2AE99645A162@apache.org> <0C220542-A27F-41F0-B3E8-35E7119E13C7@apache.org> Date: Fri, 10 Sep 2010 13:35:40 +0800 X-Google-Sender-Auth: _zcywOlee0vUVK1GDYYzgLGnOEI Message-ID: Subject: Re: reviewing the staging branch From: Deng Ching To: dev@archiva.apache.org Content-Type: text/plain; charset=ISO-8859-1 Sorry, I didn't notice this one. I'll review the branch this weekend and will send a separate thread for merging it to trunk :) Once it's been merged, I propose that we kick-off a milestone release. Thanks, Deng On Wed, Aug 25, 2010 at 2:40 PM, Brett Porter wrote: > > On 05/08/2010, at 11:29 AM, Deng Ching wrote: > >> For MRM-980 branch, the merging and resolving of conflicting versions are >> already working. The artifacts merged are also being logged in the audit >> logs now. >> >> Aside from the bugs that need to be fixed (see linked issues in MRM-980 >> jira), what's left to be done are the webapp tests and the documentation. >> I think the webapp-tests might be broken on the branch as the layout and >> data displayed in the repositories page were broken (MRM-1398). Once these >> are fixed and the webapp tests and docs are written, we can already merge >> the branch to trunk. >> >> As for a milestone release, I suggest we do one after the merge.. > > Any further plans in this regard? > > - Brett > > -- > Brett Porter > brett@apache.org > http://brettporter.wordpress.com/ > > > > >