You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@cloudstack.apache.org by Murali Reddy <Mu...@citrix.com> on 2014/03/14 15:49:42 UTC

Re: Git Push Summary

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: Git Push Summary

Posted by Murali Reddy <Mu...@citrix.com>.

On 14/03/14 8:24 PM, "Hugo Trippaers" <hu...@trippaers.nl> wrote:

>Hey Muralli,
>
>The branch is already cut and the jenkins builds are setup. So i¹m not
>going to recreate the 4.4 branch from master as all the version number
>are already updated.
>
>Which merge request are you merging in? If you can squash it it will be
>easy to pull into master and 4.4.

I am referring to region level VPC merge request. I will put squashed
commit in both 4.4 and master. Thanks for the clarification.

[1] http://www.mail-archive.com/dev@cloudstack.apache.org/msg24747.html

>
>
>Cheers,
>
>Hugo
>
>
>
>On 14 mrt. 2014, at 15:49, 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: Git Push Summary

Posted by Hugo Trippaers <hu...@trippaers.nl>.

Hey Muralli,

The branch is already cut and the jenkins builds are setup. So i’m not going to recreate the 4.4 branch from master as all the version number are already updated.

Which merge request are you merging in? If you can squash it it will be easy to pull into master and 4.4.

Cheers,

Hugo

On 14 mrt. 2014, at 15:49, 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
>