FAQ
I'm about to push the broken apart hadoop-0.20-security into
hadoop-0.20-security-patches. It is 863 patches for the main branch. There
are two release branches off of it that have a few patches each. The version
that Arun pushed originally is 0.20.202.X and there is a newer release
branch that is 0.20.203.X. The 202 and 203 branches have a few patches each.
For now, I propose calling the branches:

branch-0.20-security
branch-0.20-security-202
branch-0.20-security-203

-- Owen

Search Discussions

  • Rottinghuis, Joep at Mar 4, 2011 at 5:08 pm
    Owen,

    Branch naming is fine with me. More importantly, I'm curious what is in each.

    To clarify my understanding:
    1) Is the tip of the branch-0.20-security supposed to be equal the tip of branch-0.20-security-203? In other words, both branches should differ only in history how they got there, but their content at the end should be identical? They are close, but not the quite the same. About 44 files are different between the two.

    2) Is the branch-0.20-security-202 an earlier attempt to contribute the same as branch-0.20-security in a patch-by-patch basis, is superseded by branch-0.20-security-203 and (202) can therefore be abandoned? Or is there still some use for branch-0.20-security-202 separately from branch-0.20-security-203?

    Thanks,

    Joep


    -----Original Message-----
    From: Owen O'Malley
    Sent: Thursday, March 03, 2011 3:29 PM
    To: common-dev@hadoop.apache.org
    Subject: Massive checkin to hadoop-0.20-security-patches

    I'm about to push the broken apart hadoop-0.20-security into
    hadoop-0.20-security-patches. It is 863 patches for the main branch. There
    are two release branches off of it that have a few patches each. The version
    that Arun pushed originally is 0.20.202.X and there is a newer release
    branch that is 0.20.203.X. The 202 and 203 branches have a few patches each.
    For now, I propose calling the branches:

    branch-0.20-security
    branch-0.20-security-202
    branch-0.20-security-203

    -- Owen
  • Owen O'Malley at Mar 8, 2011 at 12:26 am
    On Mar 4, 2011, at 9:08 AM, Rottinghuis, Joep wrote:

    As far as I know, the pushes are done. The branching picture looks
    roughly like:


    --------------------------------+---------------+--------->
    branch-0.20-security
    \ \
    \
    branch-0.20-security-203
    branch-0.20-security-202

    The general model is that the 0.20-security branch is the main branch
    and the 202, 203, ... are release branches that only get bug fixes on
    them. The model would be every couple of months we'll make a new
    release branch. So in a couple of months, we'll make a 204 branch from
    0.20-security.

    The mega-patch that Arun pushed was off of the 0.20-security-202
    branch. Note that the branch-0.20-security-patches was a temporary
    branch for me to push the individual commits to. It has been renamed
    to replace the mega-patch version that Arun pushed. I'll roll a 203
    release candidate tomorrow.
    To clarify my understanding:
    1) Is the tip of the branch-0.20-security supposed to be equal the
    tip of branch-0.20-security-203? In other words, both branches
    should differ only in history how they got there, but their content
    at the end should be identical? They are close, but not the quite
    the same. About 44 files are different between the two.
    As I wrote above, Arun's mega-patch was a release off of the 202
    branch. 203 and the main branch would be further along. Arun missed a
    few files off of 202, but other than that the source code is the same.

    Does that make sense?

    -- Owen
  • Eric Yang at Mar 8, 2011 at 1:01 am
    Is there any plan to put back v1 of the metrics system? This has been removed out from branch-0.20-security. Downstream projects are depending on v1 of metrics system are unable to integrate with Hadoop 0.20-security branch. The affected projects includes HBase and Chukwa. It would be nice if this api compatibility can be maintained in 0.20.x series. Thanks

    Regards,
    Eric

    On 3/7/11 4:26 PM, "Owen O'Malley" wrote:



    On Mar 4, 2011, at 9:08 AM, Rottinghuis, Joep wrote:

    As far as I know, the pushes are done. The branching picture looks
    roughly like:


    --------------------------------+---------------+--------->
    branch-0.20-security
    \ \
    \
    branch-0.20-security-203
    branch-0.20-security-202

    The general model is that the 0.20-security branch is the main branch
    and the 202, 203, ... are release branches that only get bug fixes on
    them. The model would be every couple of months we'll make a new
    release branch. So in a couple of months, we'll make a 204 branch from
    0.20-security.

    The mega-patch that Arun pushed was off of the 0.20-security-202
    branch. Note that the branch-0.20-security-patches was a temporary
    branch for me to push the individual commits to. It has been renamed
    to replace the mega-patch version that Arun pushed. I'll roll a 203
    release candidate tomorrow.
    To clarify my understanding:
    1) Is the tip of the branch-0.20-security supposed to be equal the
    tip of branch-0.20-security-203? In other words, both branches
    should differ only in history how they got there, but their content
    at the end should be identical? They are close, but not the quite
    the same. About 44 files are different between the two.
    As I wrote above, Arun's mega-patch was a release off of the 202
    branch. 203 and the main branch would be further along. Arun missed a
    few files off of 202, but other than that the source code is the same.

    Does that make sense?

    -- Owen

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupcommon-dev @
categorieshadoop
postedMar 3, '11 at 11:29p
activeMar 8, '11 at 1:01a
posts4
users3
websitehadoop.apache.org...
irc#hadoop

People

Translate

site design / logo © 2022 Grokbase