You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Sudha Ponnaganti <su...@citrix.com> on 2014/03/14 16:09:38 UTC
[ACS4.4] RE: Git Push Summary : 4.4 feature branch
Can time be given till PST EOD as many developers are also in this time zone?
If specific features are being pulled in to 4.4, we might as well cut branch a little later where approved merge queue is cleared.
-----Original Message-----
From: Abhinandan Prateek [mailto:Abhinandan.Prateek@citrix.com]
Sent: Friday, March 14, 2014 7:56 AM
To: dev@cloudstack.apache.org
Subject: Re: Git Push Summary : 4.4 feature branch
Yes, I think we could have checked with people struggling to fix the master and commit there features.
-1 for the timing to cut the branch !
On 14/03/14 8:19 pm, "Murali Reddy" <Mu...@citrix.com> wrote:
>On 14/03/14 7:09 PM, "hugo@apache.org" <hu...@apache.org> wrote:
>
>>Repository: cloudstack
>>Updated Branches:
>> refs/heads/4.4 [created] 3ee1fc28d
>>
>
>Hugo,
>
>I was holding off merge to master, as it seems to be broken now. I see
>that you already created 4.4 branch. Can we wait till master is ready
>to be checked-in and then cut a branch?
>
>Thanks,
>Murali
>
Re: [ACS4.4] RE: Git Push Summary : 4.4 feature branch
Posted by Hugo Trippaers <hu...@trippaers.nl>.
Fair enough, i’ll try to send a reminder for the next phases a bit earlier. Just wanted to make sure that people wouldn’t forget to put their merge requests in on time.
I’m trying to be a bit strict about the timing, we are already seeing the strain on the 4.3 release which isn’t even out there yet. Breaking master in such a bad way now is quite unfortunate, but actually not uncommon for us so close to a feature freeze. I’m willing to gamble that extending the feature freeze would have made it worse.
Again, anybody with a Merge request currently open on the ML has a fair point to merge the changes into the 4.4 branch as well as into master.
Cheers,
Hugo
On 14 mrt. 2014, at 16:23, Marcus <sh...@gmail.com> wrote:
> Yes, you did. I for one was up until 2AM trying to test my branch
> against the current master to try to get it in, but gave up.
>
> I think most people saw "Get your merge request in today because I'll
> be cutting the branch on Friday". At the time that most of us in the
> west read that email, "get your merge request in today" did not apply
> because it was technically already too late per your time spec.
>
> On Fri, Mar 14, 2014 at 9:12 AM, Hugo Trippaers <hu...@trippaers.nl> wrote:
>> The branch is already cut and master has already been switched to 4.5.0. I've announced that the switch would be at 14:00 CET, you can't expect me to get up in the middle of the night to cut a release branch.
>>
>> Cheers,
>>
>> Hugo
>>
>>
>> On 14 mrt. 2014, at 16:09, Sudha Ponnaganti <su...@citrix.com> wrote:
>>
>>> Can time be given till PST EOD as many developers are also in this time zone?
>>> If specific features are being pulled in to 4.4, we might as well cut branch a little later where approved merge queue is cleared.
>>>
>>>
>>> -----Original Message-----
>>> From: Abhinandan Prateek [mailto:Abhinandan.Prateek@citrix.com]
>>> Sent: Friday, March 14, 2014 7:56 AM
>>> To: dev@cloudstack.apache.org
>>> Subject: Re: Git Push Summary : 4.4 feature branch
>>>
>>> Yes, I think we could have checked with people struggling to fix the master and commit there features.
>>> -1 for the timing to cut the branch !
>>>
>>> On 14/03/14 8:19 pm, "Murali Reddy" <Mu...@citrix.com> wrote:
>>>
>>>> On 14/03/14 7:09 PM, "hugo@apache.org" <hu...@apache.org> wrote:
>>>>
>>>>> Repository: cloudstack
>>>>> Updated Branches:
>>>>> refs/heads/4.4 [created] 3ee1fc28d
>>>>>
>>>>
>>>> Hugo,
>>>>
>>>> I was holding off merge to master, as it seems to be broken now. I see
>>>> that you already created 4.4 branch. Can we wait till master is ready
>>>> to be checked-in and then cut a branch?
>>>>
>>>> Thanks,
>>>> Murali
>>>>
>>>
>>
Re: [ACS4.4] RE: Git Push Summary : 4.4 feature branch
Posted by Marcus <sh...@gmail.com>.
Yes, you did. I for one was up until 2AM trying to test my branch
against the current master to try to get it in, but gave up.
I think most people saw "Get your merge request in today because I'll
be cutting the branch on Friday". At the time that most of us in the
west read that email, "get your merge request in today" did not apply
because it was technically already too late per your time spec.
On Fri, Mar 14, 2014 at 9:12 AM, Hugo Trippaers <hu...@trippaers.nl> wrote:
> The branch is already cut and master has already been switched to 4.5.0. I've announced that the switch would be at 14:00 CET, you can't expect me to get up in the middle of the night to cut a release branch.
>
> Cheers,
>
> Hugo
>
>
> On 14 mrt. 2014, at 16:09, Sudha Ponnaganti <su...@citrix.com> wrote:
>
>> Can time be given till PST EOD as many developers are also in this time zone?
>> If specific features are being pulled in to 4.4, we might as well cut branch a little later where approved merge queue is cleared.
>>
>>
>> -----Original Message-----
>> From: Abhinandan Prateek [mailto:Abhinandan.Prateek@citrix.com]
>> Sent: Friday, March 14, 2014 7:56 AM
>> To: dev@cloudstack.apache.org
>> Subject: Re: Git Push Summary : 4.4 feature branch
>>
>> Yes, I think we could have checked with people struggling to fix the master and commit there features.
>> -1 for the timing to cut the branch !
>>
>> On 14/03/14 8:19 pm, "Murali Reddy" <Mu...@citrix.com> wrote:
>>
>>> On 14/03/14 7:09 PM, "hugo@apache.org" <hu...@apache.org> wrote:
>>>
>>>> Repository: cloudstack
>>>> Updated Branches:
>>>> refs/heads/4.4 [created] 3ee1fc28d
>>>>
>>>
>>> Hugo,
>>>
>>> I was holding off merge to master, as it seems to be broken now. I see
>>> that you already created 4.4 branch. Can we wait till master is ready
>>> to be checked-in and then cut a branch?
>>>
>>> Thanks,
>>> Murali
>>>
>>
>
Re: [ACS4.4] RE: Git Push Summary : 4.4 feature branch
Posted by Hugo Trippaers <hu...@trippaers.nl>.
The branch is already cut and master has already been switched to 4.5.0. I’ve announced that the switch would be at 14:00 CET, you can’t expect me to get up in the middle of the night to cut a release branch.
Cheers,
Hugo
On 14 mrt. 2014, at 16:09, Sudha Ponnaganti <su...@citrix.com> wrote:
> Can time be given till PST EOD as many developers are also in this time zone?
> If specific features are being pulled in to 4.4, we might as well cut branch a little later where approved merge queue is cleared.
>
>
> -----Original Message-----
> From: Abhinandan Prateek [mailto:Abhinandan.Prateek@citrix.com]
> Sent: Friday, March 14, 2014 7:56 AM
> To: dev@cloudstack.apache.org
> Subject: Re: Git Push Summary : 4.4 feature branch
>
> Yes, I think we could have checked with people struggling to fix the master and commit there features.
> -1 for the timing to cut the branch !
>
> On 14/03/14 8:19 pm, "Murali Reddy" <Mu...@citrix.com> wrote:
>
>> On 14/03/14 7:09 PM, "hugo@apache.org" <hu...@apache.org> wrote:
>>
>>> Repository: cloudstack
>>> Updated Branches:
>>> refs/heads/4.4 [created] 3ee1fc28d
>>>
>>
>> Hugo,
>>
>> I was holding off merge to master, as it seems to be broken now. I see
>> that you already created 4.4 branch. Can we wait till master is ready
>> to be checked-in and then cut a branch?
>>
>> Thanks,
>> Murali
>>
>