Merge away! :) +1.
Cheers, Chris ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Chris Mattmann, Ph.D. Senior Computer Scientist NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA Office: 171-266B, Mailstop: 171-246 Email: [email protected] WWW: http://sunset.usc.edu/~mattmann/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Adjunct Assistant Professor, Computer Science Department University of Southern California, Los Angeles, CA 90089 USA ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -----Original Message----- From: Julien Le Dem <[email protected]> Reply-To: "[email protected]" <[email protected]> Date: Monday, June 3, 2013 1:51 AM To: "[email protected]" <[email protected]> Subject: Re: merge branch TEZ-1 to trunk >+1 to merge TEZ-1 into master. >"trunk" is an svn notion. In git it is called "master". I suggest we >refer to it this way and not rename it to trunk. > > >On Fri, May 31, 2013 at 2:57 PM, Bikas Saha <[email protected]> wrote: >> +1 for both. Also I think "trunk" is actually called master. Perhaps we >> should change it to "trunk". >> >> Bikas >> >> -----Original Message----- >> From: Arun Murthy [mailto:[email protected]] >> Sent: Friday, May 31, 2013 5:47 AM >> To: [email protected] >> Subject: Re: merge branch TEZ-1 to trunk >> >> +1! >> >> Arun >> >> Sent from my iPhone >> >> On May 30, 2013, at 11:33 PM, Vinod Kumar Vavilapalli >> <[email protected]> wrote: >> >>> >>> +1 for merge. >>> >>> +1 for copying old trunk over to a branch. >>> >>> Thanks, >>> +Vinod >>> >>> On May 30, 2013, at 11:08 PM, Siddharth Seth wrote: >>> >>>> The TEZ-1 branch has been under active development for the past month >>>> or two. It's a reasonable divergence from trunk - which is unlikely >>>> to see any development. One of the big changes in the TEZ-1 branch is >>>> the support for a minimal DAG (linear MRR for now). >>>> >>>> Trunk having an unmaintained older copy of the code serves no >>>> purpose, and instead is confusing for users who want to try Tez. >>>> >>>> Unless there are objections, I'd like to merge/replace branch TEZ-1 >>>> to trunk sometime early next week. Development can then continue on >>>> trunk. As part of this existing trunk can be copied over to another >> branch. >>>> >>>> Thanks >>>> - Sid >>>
