Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Received-SPF: pass (nike.apache.org: domain of mike.tutkowski@solidfire.com
 designates 209.85.219.43 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CAGQtxvbUWzOuf1jFp8W9g+Wm5UR6q0GohN03ZDCbmykNGdT+nA@mail.gmail.com>
References: 
 <CA+2rt43QKD6sM4WvUFu4RUqauyDRLdbtNwzV+-tRD0Eb=xZf2w@mail.gmail.com>
	<CAGQtxvbhu2n0V9xRgRMmvdDt9L2W6F_oB2_qSM=MC2Fh2zsurw@mail.gmail.com>
	<CA+2rt40HG6X-PNYZPt9ENK_h7QXp3ef1U2RbsGnikaSMT4zpSA@mail.gmail.com>
	<CAGQtxvbUWzOuf1jFp8W9g+Wm5UR6q0GohN03ZDCbmykNGdT+nA@mail.gmail.com>
Date: Tue, 22 Apr 2014 15:23:44 -0600
Message-ID: 
 <CACOnxCjPK_u-op-mGwDObr4O6hdct1xvXC-Ub8uOfSvNrad4wQ@mail.gmail.com>
Subject: Re: [ACS44] 4.4-forward branch creation accident
From: Mike Tutkowski <mike.tutkowski@solidfire.com>
To: "dev@cloudstack.apache.org" <dev@cloudstack.apache.org>
Content-Type: multipart/alternative; boundary=001a11346e9a0f8ee604f7a83b1b

--001a11346e9a0f8ee604f7a83b1b
Content-Type: text/plain; charset=ISO-8859-1

So - just to clarify - at the time being 4.4 and 4.4-forward are
purposefully intended on being the same, right? As I look at Git, that's
the way I see it.

Thanks


On Tue, Apr 22, 2014 at 2:53 PM, Daan Hoogland <daan.hoogland@gmail.com>wrote:

> I have recreated the branch 4.4-forward. I renamed the old 4.4-forward
> locally. Please inform me if you are missing commits in the present
> 4.4-forward.
>
> On Tue, Apr 22, 2014 at 10:51 PM, Sheng Yang <sheng@yasker.org> wrote:
> > Thanks Daan.
> >
> > --Sheng
> >
> >
> > On Tue, Apr 22, 2014 at 1:46 PM, Daan Hoogland <daan.hoogland@gmail.com
> >wrote:
> >
> >> Sheng, you are right. I will try to rename 4.4-forward and recreate
> >> from 4.4. I didn't notice the older commits on the branch.
> >>
> >> On Tue, Apr 22, 2014 at 10:37 PM, Sheng Yang <sheng@yasker.org> wrote:
> >> > Wait, MASTER is very difference from 4.4 branch which is feature
> freezed
> >> > one month before. People are still working on MASTER for new
> features, I
> >> > don't think it would be possible to kick out the commits not in 4.4
> >> branch.
> >> >
> >> > I would suggest save the commits in 4.4-forward, discard the current
> >> > 4.4-forward branch and re-fork from 4.4 branch.
> >> >
> >> > It just has been 2 days and it's still fixable. Please don't wait
> until
> >> > it's too late.
> >> >
> >> > --Sheng
> >> >
> >> > On Tue, Apr 22, 2014 at 1:05 AM, Daan Hoogland <
> daan.hoogland@gmail.com
> >> >wrote:
> >> >
> >> >> Well, I seem to have been forking master instead of 4.4. I am
> amending
> >> >> this while writing this mail. Feel free to cherry-pick whatever is
> >> >> needed to 4.4-forward. (but update/pull/fetch/rebase first)
> >> >>
> >> >> sorry for the inconvenience,
> >> >> Daan
> >> >>
> >> >> On Tue, Apr 22, 2014 at 12:31 AM, Min Chen <min.chen@citrix.com>
> wrote:
> >> >> > Sorry, typo. I meant to say that they are not in 4.4-forward. Now I
> >> need
> >> >> > to make a commit to 4.4-forward, and not sure if I need to pursue
> or
> >> wait
> >> >> > for your fix.
> >> >> >
> >> >> > Thanks
> >> >> > -min
> >> >> >
> >> >> > On 4/21/14 3:26 PM, "Min Chen" <min.chen@citrix.com> wrote:
> >> >> >
> >> >> >>For example, all my commit after and including
> >> >> >>563efad9aee29ea31f10381694c5b55791d561fc made on 4/17 is not there
> in
> >> >> 4.4.
> >> >> >>
> >> >> >>Thanks
> >> >> >>-min
> >> >> >>
> >> >> >>On 4/21/14 3:22 PM, "Min Chen" <min.chen@citrix.com> wrote:
> >> >> >>
> >> >> >>>Daan,
> >> >> >>>
> >> >> >>>      How did you create 4.4-forward branch? I found that 4.4
> branch
> >> >> has a lot
> >> >> >>>of commits that are not in 4.4-forward branch, and those commits
> are
> >> >> made
> >> >> >>>before code freeze date.
> >> >> >>>
> >> >> >>>      Can you please double check?
> >> >> >>>
> >> >> >>>      Thanks
> >> >> >>>      -min
> >> >> >>>
> >> >> >>>On 4/19/14 8:07 AM, "Daan Hoogland" <daan.hoogland@gmail.com>
> wrote:
> >> >> >>>
> >> >> >>>>All,
> >> >> >>>>
> >> >> >>>>I created 4.4-forward. Please do all checkins for here on in on
> this
> >> >> >>>>new branch. If you have a commit for a blocking issue, please
> >> request
> >> >> >>>>for it to be cherry-picked on the 4.4 branch on this list and use
> >> the
> >> >> >>>>[ACS44] tag. Hugo and I will distribute the work involved for
> this.
> >> >> >>>>
> >> >> >>>>kind regards,
> >> >> >>>>--
> >> >> >>>>Daan
> >> >> >>>
> >> >> >>
> >> >> >
> >> >>
> >> >>
> >> >>
> >> >> --
> >> >> Daan
> >> >>
> >>
> >>
> >>
> >> --
> >> Daan
> >>
>
>
>
> --
> Daan
>


-- 
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkowski@solidfire.com
o: 303.746.7302
Advancing the way the world uses the
cloud<http://solidfire.com/solution/overview/?video=play>
*(tm)*

--001a11346e9a0f8ee604f7a83b1b--