Mailing-List: contact hdfs-dev-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: hdfs-dev@hadoop.apache.org
Received-SPF: pass (athena.apache.org: domain of eli@cloudera.com designates
 209.85.160.176 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CADY20s5FAYmqp+MgFbK6Kz1v=BMXr3t94xZTL_Q1BzGNOnhumg@mail.gmail.com>
References: 
 <CADY20s5FAYmqp+MgFbK6Kz1v=BMXr3t94xZTL_Q1BzGNOnhumg@mail.gmail.com>
Date: Wed, 7 Sep 2011 16:20:34 -0700
Message-ID: 
 <CAPn_vTt+dPLiKhfMGdW6XtK7hA5SJON_Fk0YKu5fCQ+xRz2Nvg@mail.gmail.com>
Subject: Re: Merging trunk, 0.23.0, HA?
From: Eli Collins <eli@cloudera.com>
To: hdfs-dev@hadoop.apache.org
Content-Type: text/plain; charset=ISO-8859-1

On Wed, Sep 7, 2011 at 3:03 PM, Todd Lipcon <todd@cloudera.com> wrote:
> Hey all,
>
> I'm trying to reconcile some of the recent changes in trunk, HA, and
> 0.23. In particular, I'm hoping to merge HDFS-2197 back into both of
> those branches. If we don't perform this merge, then any modification
> to the RPC methods in the NameNode will require manual re-application.
>
> At this point, I'm thinking of doing the following:
> - merge all of the recent trunk commits into HA branch
> - cherry-pick just this commit from trunk into 0.23.

Seems reasonable.

Thanks,
Eli