Assuming this is OK, I have a candidate merge here: https://github.com/toddlipcon/hadoop-common/tree/hdfs-1623-merged-trunk-20110907
This carries over Suresh's changes from HDFS-1974 into the refactored NameNodeRpcServer. Thanks, -Todd On Wed, Sep 7, 2011 at 3:03 PM, Todd Lipcon <t...@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. > > Does that seem like the correct strategy? Does anyone object to > HDFS-2197 going in 0.23.0 branch? > > Thanks > -Todd > -- > Todd Lipcon > Software Engineer, Cloudera > -- Todd Lipcon Software Engineer, Cloudera
