We followed the process laid out in a mail thread from 2015 that had two workflows proposed.
“Git rebase” workflows and “Git merge” workflows. Ozone had followed git merge workflow, which merged trunk at a regular frequency into ozone, and then ozone was merged back. Here is the mail that we followed for the merge process. https://lists.apache.org/thread.html/43cd65c6b6c3c0e8ac Thanks Xiaoyu From: Owen O'Malley <owen.omal...@gmail.com> Date: Wednesday, April 25, 2018 at 11:15 AM To: Chris Douglas <cdoug...@apache.org> Cc: Xiaoyu Yao <x...@hortonworks.com>, Jitendra Pandey <jiten...@hortonworks.com>, Hdfs-dev <hdfs-dev@hadoop.apache.org> Subject: Re: [RESULT][VOTE] Merge HDDS (HDFS-7240) *code* into trunk *sigh* I asked you guys to rebase this before merge. It is tempting to squash it into a single commit. .. Owen On Wed, Apr 25, 2018 at 11:06 AM, Chris Douglas <cdoug...@apache.org<mailto:cdoug...@apache.org>> wrote: This really made a mess of trunk. Periodically merging trunk into the HDFS-7240 branch, then merging the whole thing back, created a tangle of references that's very difficult to work with (look at the output of git log --graph). I'm not sure it's even possible to fix this, but this is why feature branches should rebase and create a merge commit with --no-ff. -C On Tue, Apr 24, 2018 at 1:20 PM, Xiaoyu Yao <x...@hortonworks.com<mailto:x...@hortonworks.com>> wrote: > I just merged the branch to trunk (834 commits in total) > Again, thanks for all who contributed to HDDS/Ozone! > > Cheers > -Xiaoyu > > On 4/23/18, 7:26 PM, "Jitendra Pandey" > <jiten...@hortonworks.com<mailto:jiten...@hortonworks.com>> wrote: > > The vote passes with many +1s (12 committers + 5 contributors) and no -1. > > Thanks everyone for voting. > > On 4/17/18, 5:19 AM, "Jitendra Pandey" > <jiten...@hortonworks.com<mailto:jiten...@hortonworks.com>> wrote: > > Hi All, > > The community unanimously voted > (https://s.apache.org/HDDSMergeResult) to adopt > HDDS/Ozone as a sub-project of Hadoop, here is the formal vote > for code merge. > > Here is a quick summary of the code changes: > > - As decided in the JIRA HDFS-10419, the project has been renamed > to Hadoop Distributed Data Store or HDDS. > - HDDS becomes a sub-project of Hadoop. > - Added a Maven profile that disables HDDS compilation by default. > - The releases of HDDS will be independent of Hadoop and will > have no impact to current Hadoop release process. > - We have made HDDS a loadable module. > - Cleaned up changes in HDFS/Hadoop Common to make sure HDDS does > not impact current users of HDFS. > > The vote will run for 7 days, I will start this vote with my +1. > > Thanks > Jitendra > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: > hdfs-dev-unsubscr...@hadoop.apache.org<mailto:hdfs-dev-unsubscr...@hadoop.apache.org> > For additional commands, e-mail: > hdfs-dev-h...@hadoop.apache.org<mailto:hdfs-dev-h...@hadoop.apache.org> > > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: > hdfs-dev-unsubscr...@hadoop.apache.org<mailto:hdfs-dev-unsubscr...@hadoop.apache.org> > For additional commands, e-mail: > hdfs-dev-h...@hadoop.apache.org<mailto:hdfs-dev-h...@hadoop.apache.org> > > > --------------------------------------------------------------------- To unsubscribe, e-mail: hdfs-dev-unsubscr...@hadoop.apache.org<mailto:hdfs-dev-unsubscr...@hadoop.apache.org> For additional commands, e-mail: hdfs-dev-h...@hadoop.apache.org<mailto:hdfs-dev-h...@hadoop.apache.org>
