Re: [RESULT][VOTE] Merge HDDS (HDFS-7240) *code* into trunk

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 > >> > >> >

Re: [RESULT][VOTE] Merge HDDS (HDFS-7240) *code* into trunk

ed for the merge process. >> https://lists.apache.org/thread.html/43cd65c6b6c3c0e8ac >> >> Thanks >> Xiaoyu >> >> >> >> >> >> *From: *Owen O'Malley <owen.omal...@gmail.com> >> *Date: *Wednesd

Re: [RESULT][VOTE] Merge HDDS (HDFS-7240) *code* into trunk

pache.org/thread.html/43cd65c6b6c3c0e8ac >> >> Thanks >> Xiaoyu >> >> >> >> >> >> *From: *Owen O'Malley <owen.omal...@gmail.com> >> *Date: *Wednesday, April 25, 2018 at 11:15 AM >> *T

Re: [RESULT][VOTE] Merge HDDS (HDFS-7240) *code* into trunk

8ac >> >> 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

Re: [RESULT][VOTE] Merge HDDS (HDFS-7240) *code* into trunk

nworks.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 tempti

Re: [RESULT][VOTE] Merge HDDS (HDFS-7240) *code* into trunk

dra 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 1

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 wrote: > This really made a mess of trunk. Periodically merging trunk into the > HDFS-7240 branch, then merging

Re: [RESULT][VOTE] Merge HDDS (HDFS-7240) *code* into trunk

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

Re: [RESULT][VOTE] Merge HDDS (HDFS-7240) *code* into trunk

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" wrote: The vote passes with many +1s (12 committers + 5 contributors) and no -1. Thanks