You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tez.apache.org by Siddharth Seth <ss...@apache.org> on 2013/05/31 08:08:20 UTC
merge branch TEZ-1 to trunk
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
RE: merge branch TEZ-1 to trunk
Posted by Bikas Saha <bi...@hortonworks.com>.
Thanks! I have able to deploy and run sleep job but TestMRR is crashing
for me.
-----Original Message-----
From: Siddharth Seth [mailto:seth.siddharth@gmail.com]
Sent: Monday, June 03, 2013 10:37 PM
To: dev@tez.incubator.apache.org
Subject: Re: merge branch TEZ-1 to trunk
Done.
branch 'tez-0.1' is what 'master' used to be.
'TEZ-1' merged into 'master'
Would appreciate if someone can validate the branches. There's a
misleading message in the commit logs "Merge branch 'master' into TEZ-1" -
that's from the way the merge was done.
After this, we can start committing directly to master.
Thanks
- Sid
On Mon, Jun 3, 2013 at 7:38 AM, Mattmann, Chris A (398J) <
chris.a.mattmann@jpl.nasa.gov> wrote:
> 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: chris.a.mattmann@nasa.gov
> 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 <ju...@twitter.com>
> Reply-To: "dev@tez.incubator.apache.org"
> <de...@tez.incubator.apache.org>
> Date: Monday, June 3, 2013 1:51 AM
> To: "dev@tez.incubator.apache.org" <de...@tez.incubator.apache.org>
> 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 <bi...@hortonworks.com>
> 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:acm@hortonworks.com]
> >> Sent: Friday, May 31, 2013 5:47 AM
> >> To: dev@tez.incubator.apache.org
> >> 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
> >> <vi...@hortonworks.com> 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
> >>>
>
>
Re: merge branch TEZ-1 to trunk
Posted by Siddharth Seth <se...@gmail.com>.
Done.
branch 'tez-0.1' is what 'master' used to be.
'TEZ-1' merged into 'master'
Would appreciate if someone can validate the branches. There's a misleading
message in the commit logs "Merge branch 'master' into TEZ-1" - that's from
the way the merge was done.
After this, we can start committing directly to master.
Thanks
- Sid
On Mon, Jun 3, 2013 at 7:38 AM, Mattmann, Chris A (398J) <
chris.a.mattmann@jpl.nasa.gov> wrote:
> 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: chris.a.mattmann@nasa.gov
> 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 <ju...@twitter.com>
> Reply-To: "dev@tez.incubator.apache.org" <de...@tez.incubator.apache.org>
> Date: Monday, June 3, 2013 1:51 AM
> To: "dev@tez.incubator.apache.org" <de...@tez.incubator.apache.org>
> 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 <bi...@hortonworks.com>
> 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:acm@hortonworks.com]
> >> Sent: Friday, May 31, 2013 5:47 AM
> >> To: dev@tez.incubator.apache.org
> >> 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
> >> <vi...@hortonworks.com> 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
> >>>
>
>
Re: merge branch TEZ-1 to trunk
Posted by "Mattmann, Chris A (398J)" <ch...@jpl.nasa.gov>.
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: chris.a.mattmann@nasa.gov
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 <ju...@twitter.com>
Reply-To: "dev@tez.incubator.apache.org" <de...@tez.incubator.apache.org>
Date: Monday, June 3, 2013 1:51 AM
To: "dev@tez.incubator.apache.org" <de...@tez.incubator.apache.org>
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 <bi...@hortonworks.com> 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:acm@hortonworks.com]
>> Sent: Friday, May 31, 2013 5:47 AM
>> To: dev@tez.incubator.apache.org
>> 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
>> <vi...@hortonworks.com> 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
>>>
Re: merge branch TEZ-1 to trunk
Posted by Julien Le Dem <ju...@twitter.com>.
+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 <bi...@hortonworks.com> 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:acm@hortonworks.com]
> Sent: Friday, May 31, 2013 5:47 AM
> To: dev@tez.incubator.apache.org
> 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
> <vi...@hortonworks.com> 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
>>
RE: merge branch TEZ-1 to trunk
Posted by Bikas Saha <bi...@hortonworks.com>.
+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:acm@hortonworks.com]
Sent: Friday, May 31, 2013 5:47 AM
To: dev@tez.incubator.apache.org
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
<vi...@hortonworks.com> 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
>
Re: merge branch TEZ-1 to trunk
Posted by Arun Murthy <ac...@hortonworks.com>.
+1!
Arun
Sent from my iPhone
On May 30, 2013, at 11:33 PM, Vinod Kumar Vavilapalli
<vi...@hortonworks.com> 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
>
Re: merge branch TEZ-1 to trunk
Posted by Vinod Kumar Vavilapalli <vi...@hortonworks.com>.
+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