Return-Path: X-Original-To: apmail-hadoop-common-dev-archive@www.apache.org Delivered-To: apmail-hadoop-common-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D6E4D74EB for ; Thu, 1 Dec 2011 08:45:45 +0000 (UTC) Received: (qmail 93446 invoked by uid 500); 1 Dec 2011 08:45:44 -0000 Delivered-To: apmail-hadoop-common-dev-archive@hadoop.apache.org Received: (qmail 93377 invoked by uid 500); 1 Dec 2011 08:45:44 -0000 Mailing-List: contact common-dev-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-dev@hadoop.apache.org Received: (qmail 93360 invoked by uid 99); 1 Dec 2011 08:45:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Dec 2011 08:45:42 +0000 X-ASF-Spam-Status: No, hits=2.2 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [209.85.216.48] (HELO mail-qw0-f48.google.com) (209.85.216.48) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Dec 2011 08:45:36 +0000 Received: by qam2 with SMTP id 2so1353908qam.14 for ; Thu, 01 Dec 2011 00:45:13 -0800 (PST) MIME-Version: 1.0 Received: by 10.229.101.3 with SMTP id a3mr180540qco.159.1322729113281; Thu, 01 Dec 2011 00:45:13 -0800 (PST) Sender: niels@basj.es Received: by 10.229.38.205 with HTTP; Thu, 1 Dec 2011 00:45:13 -0800 (PST) X-Originating-IP: [212.121.118.65] In-Reply-To: References: Date: Thu, 1 Dec 2011 09:45:13 +0100 X-Google-Sender-Auth: Nmf3k5wN0-P2a_fK82mMFrMYZDE Message-ID: Subject: Re: Which branch for my patch? From: Niels Basjes To: common-dev@hadoop.apache.org Content-Type: multipart/alternative; boundary=0016364ee62cee661d04b303de90 --0016364ee62cee661d04b303de90 Content-Type: text/plain; charset=ISO-8859-1 Thanks, I'll get busy creating a new patch over the next few days. Niels Basjes On Wed, Nov 30, 2011 at 18:51, Eli Collins wrote: > Hey Niels, > > Thanks for contributing. The nest place to contribute new features is > to trunk. It's currently an easy merge from trunk to branch 23 to get > it in a 23.x release (you can set the jira's target version to 23.1 to > indicate this). > > Your patch based on the old structure would be useful for backporting > this feature from trunk to a release with the old structure (eg 1.x, > 0.22). To request inclusion in a 1.x release set the target version to > 1.1.0 (and generate a patch against branch-1). To request inclusion in > 0.22 set target version to 0.22.0 (and generate a patch against > branch-0.22). > > Thanks, > Eli > > On Wed, Nov 30, 2011 at 8:23 AM, Niels Basjes wrote: > > Hi all, > > > > A while ago I created a feature for Hadoop and submitted this to be > > included (HADOOP-7076) . > > Around the same time the MRv2 started happening and the entire source > tree > > was restructured. > > > > At this moment I'm prepared to change the patch I created earlier so I > can > > submit it again for your consideration. > > > > Caused by the email about the new branches (branch-1 and branch-1.0) I'm > a > > bit puzzled at this moment where to start. > > > > I see the mentioned branches and the trunk at probable starting points. > > > > As far as I understand the repository structure the branch-1 is the basis > > for the "old style" Hadoop and the trunk is the basis for the "yarn" > Hadoop. > > > > For which branch of the source tree should I make my changes so you guys > > will reevaluate it for inclusion? > > > > Thanks. > > > > -- > > Best regards / Met vriendelijke groeten, > > > > Niels Basjes > -- Best regards / Met vriendelijke groeten, Niels Basjes --0016364ee62cee661d04b303de90--