This one is in. You did write commitsss. can you give me the long commit ids?
On Wed, Apr 23, 2014 at 6:52 AM, Koushik Das <[email protected]> wrote: > Daan, > I am not seeing the commits that went to the previously created 4.4-forward > branch in the new 4.4-forward branch. For e.g. > https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=c8f2bf2 > Are you going to merge all of them into 4.4-forward? > > -Koushik > > On 23-Apr-2014, at 2:53 AM, Mike Tutkowski <[email protected]> > wrote: > >> 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 >> <[email protected]>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 <[email protected]> wrote: >>>> Thanks Daan. >>>> >>>> --Sheng >>>> >>>> >>>> On Tue, Apr 22, 2014 at 1:46 PM, Daan Hoogland <[email protected] >>>> 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 <[email protected]> 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 < >>> [email protected] >>>>>> 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 <[email protected]> >>> 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" <[email protected]> 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" <[email protected]> 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" <[email protected]> >>> 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: [email protected] >> o: 303.746.7302 >> Advancing the way the world uses the >> cloud<http://solidfire.com/solution/overview/?video=play> >> *(tm)* > -- Daan
